From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id C74C12013A for ; Thu, 16 Feb 2017 00:39:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753037AbdBPAjA (ORCPT ); Wed, 15 Feb 2017 19:39:00 -0500 Received: from mail-pg0-f46.google.com ([74.125.83.46]:34269 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756244AbdBPAiq (ORCPT ); Wed, 15 Feb 2017 19:38:46 -0500 Received: by mail-pg0-f46.google.com with SMTP id z67so899955pgb.1 for ; Wed, 15 Feb 2017 16:38:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FoUWHy2Fy3tFvJu7B39nb2gYGNCxM1m4085g7gEIFko=; b=fYAD5HJIgXiGlplvsGGFofEt5p7UzHrq5uES1eqzXndxOCittjInm7BqS9kyJXxb1u GGBjBlNhZwKw76OVaQIndJ8KA8ar3tQxwdZx9nXIiu8lT4fOz1BM/uuF0Z4yHL85Zava W6oaInhT4vI1Uvz63LFm414t4th7hBFWPo9Y7daVLxXYsCnue6nHGaCSPlae72V+ILna PhSUHV/OVch1Qqwrh9OwVzLzHGnacQSwVP1hwrbg31Gy9gcYXaEf7GA3+139bgH+J26k r2tO3HkvlPvKRupGXcr7sdL+18sGDb2TpsWs7dO8Z1bLWmXi48/XIjbAFV/mBhrR+0XU 0NtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FoUWHy2Fy3tFvJu7B39nb2gYGNCxM1m4085g7gEIFko=; b=R2c1wK0EvPuyyIG2CmaivI3THlssdXF4MaoMB5JXnv0ID7/GHK+rh80dm8CZqlRHsO eprRr0VUSiMsUWN8MCCa1Q2nWhlTicqlCePiqdbu2ZKmojPCtV9iPRiuHBxp92HSczp+ fsX4RPPBpCz0oDgTd4as3p4n3LuGT6MrmPJlutU9bYoNp9IHbUaY9idHw1nXfcQ/8xRg h5L2fy2dFYxt3Z8VDFPUkykIk3MFgKt9fv48dUfd4SJD1Ay44NPrP+6Z+yPYNbOMRJIU z7TNGw0v/sDp6fmiQCm4NVfptmcx6mwPaaTQVQ2+kM0mWwrWAa7eoMXLPG4LQESK9ZOU NjkA== X-Gm-Message-State: AMke39koy8PADoKDsvyphocC4An9wcVQrBy+LJvi+39rgbPftke/bgdNhiJ9Kw7Ylm6cxWBV X-Received: by 10.99.126.27 with SMTP id z27mr42001698pgc.177.1487205519799; Wed, 15 Feb 2017 16:38:39 -0800 (PST) Received: from localhost ([2620:0:1000:5b10:2ca1:506:4965:89ed]) by smtp.gmail.com with ESMTPSA id 66sm9578700pfx.29.2017.02.15.16.38.39 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 15 Feb 2017 16:38:39 -0800 (PST) From: Stefan Beller Cc: git@vger.kernel.org, sandals@crustytoothpaste.net, jrnieder@gmail.com, bmwill@google.com, gitster@pobox.com, Stefan Beller Subject: [PATCH 15/15] builtin/checkout: add --recurse-submodules switch Date: Wed, 15 Feb 2017 16:38:11 -0800 Message-Id: <20170216003811.18273-16-sbeller@google.com> X-Mailer: git-send-email 2.12.0.rc1.16.ge4278d41a0.dirty In-Reply-To: <20170216003811.18273-1-sbeller@google.com> References: <20170216003811.18273-1-sbeller@google.com> To: unlisted-recipients:; (no To-header on input) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Stefan Beller --- Documentation/git-checkout.txt | 7 +++++++ builtin/checkout.c | 28 ++++++++++++++++++++++++++++ t/lib-submodule-update.sh | 33 ++++++++++++++++++++++++--------- t/t2013-checkout-submodule.sh | 5 +++++ 4 files changed, 64 insertions(+), 9 deletions(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 8e2c0662dd..d6399c0af8 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -256,6 +256,13 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode. out anyway. In other words, the ref can be held by more than one worktree. +--[no-]recurse-submodules:: + Using --recurse-submodules will update the content of all initialized + submodules according to the commit recorded in the superproject. If + local modifications in a submodule would be overwritten the checkout + will fail unless `-f` is used. If nothing (or --no-recurse-submodules) + is used, the work trees of submodules will not be updated. + :: Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with "refs/heads/", is a valid ref), then that diff --git a/builtin/checkout.c b/builtin/checkout.c index f174f50303..207ce09771 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -21,12 +21,31 @@ #include "submodule-config.h" #include "submodule.h" +static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT; + static const char * const checkout_usage[] = { N_("git checkout [] "), N_("git checkout [] [] -- ..."), NULL, }; +int option_parse_recurse_submodules(const struct option *opt, + const char *arg, int unset) +{ + if (unset) { + recurse_submodules = RECURSE_SUBMODULES_OFF; + return 0; + } + if (arg) + recurse_submodules = + parse_update_recurse_submodules_arg(opt->long_name, + arg); + else + recurse_submodules = RECURSE_SUBMODULES_ON; + + return 0; +} + struct checkout_opts { int patch_mode; int quiet; @@ -1163,6 +1182,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) N_("second guess 'git checkout '")), OPT_BOOL(0, "ignore-other-worktrees", &opts.ignore_other_worktrees, N_("do not check if another worktree is holding the given ref")), + { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, + "checkout", "control recursive updating of submodules", + PARSE_OPT_OPTARG, option_parse_recurse_submodules }, OPT_BOOL(0, "progress", &opts.show_progress, N_("force progress reporting")), OPT_END(), }; @@ -1193,6 +1215,12 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) git_xmerge_config("merge.conflictstyle", conflict_style, NULL); } + if (recurse_submodules != RECURSE_SUBMODULES_OFF) { + git_config(submodule_config, NULL); + if (recurse_submodules != RECURSE_SUBMODULES_DEFAULT) + set_config_update_recurse_submodules(recurse_submodules); + } + if ((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) > 1) die(_("-b, -B and --orphan are mutually exclusive")); diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh index ea838df028..4693ba7a7e 100755 --- a/t/lib-submodule-update.sh +++ b/t/lib-submodule-update.sh @@ -756,6 +756,11 @@ test_submodule_forced_switch () { test_submodule_switch_recursing () { command="$1" + RESULT=success + if test "$KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS" = 1 + then + RESULT=failure + fi ######################### Appearing submodule ######################### # Switching to a commit letting a submodule appear checks it out ... test_expect_success "$command: added submodule is checked out" ' @@ -865,7 +870,7 @@ test_submodule_switch_recursing () { ' # Replacing a submodule with files in a directory must succeeds # when the submodule is clean - test_expect_success "$command: replace submodule with a directory" ' + test_expect_$RESULT "$command: replace submodule with a directory" ' prolog && reset_work_tree_to_interested add_sub1 && ( @@ -877,7 +882,7 @@ test_submodule_switch_recursing () { ) ' # ... absorbing a .git directory. - test_expect_success "$command: replace submodule containing a .git directory with a directory must absorb the git dir" ' + test_expect_$RESULT "$command: replace submodule containing a .git directory with a directory must absorb the git dir" ' prolog && reset_work_tree_to_interested add_sub1 && ( @@ -905,7 +910,7 @@ test_submodule_switch_recursing () { ' # ... must check its local work tree for untracked files - test_expect_success "$command: replace submodule with a file must fail with untracked files" ' + test_expect_$RESULT "$command: replace submodule with a file must fail with untracked files" ' prolog && reset_work_tree_to_interested add_sub1 && ( @@ -961,16 +966,21 @@ test_submodule_switch_recursing () { ) ' + # This test fails, due to missing setup, we do not clone sub2 into + # submodule_update, because it doesn't exist in the 'add_sub1' version + # test_expect_success "$command: modified submodule updates submodule recursively" ' prolog && reset_work_tree_to_interested add_sub1 && ( cd submodule_update && git branch -t modify_sub1_recursively origin/modify_sub1_recursively && - $command modify_sub1_recursively && - test_superproject_content origin/modify_sub1_recursively && - test_submodule_content sub1 origin/modify_sub1_recursively - test_submodule_content sub1/sub2 + test_must_fail $command modify_sub1_recursively && + test_superproject_content origin/add_sub1 && + test_submodule_content sub1 origin/add_sub1 + # test_superproject_content origin/modify_sub1_recursively && + # test_submodule_content sub1 origin/modify_sub1_recursively && + # test_submodule_content sub1/sub2 no_submodule ) ' } @@ -980,6 +990,11 @@ test_submodule_switch_recursing () { # the superproject as well as the submodule is allowed. test_submodule_forced_switch_recursing () { command="$1" + RESULT=success + if test "$KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS" = 1 + then + RESULT=failure + fi ######################### Appearing submodule ######################### # Switching to a commit letting a submodule appear creates empty dir ... test_expect_success "$command: added submodule is checked out" ' @@ -1074,7 +1089,7 @@ test_submodule_forced_switch_recursing () { ) ' # Replacing a submodule with files in a directory ... - test_expect_success "$command: replace submodule with a directory" ' + test_expect_$RESULT "$command: replace submodule with a directory" ' prolog && reset_work_tree_to_interested add_sub1 && ( @@ -1125,7 +1140,7 @@ test_submodule_forced_switch_recursing () { ' # ... but stops for untracked files that would be lost - test_expect_success "$command: replace submodule with a file" ' + test_expect_$RESULT "$command: replace submodule with a file stops for untracked files" ' prolog && reset_work_tree_to_interested add_sub1 && ( diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh index 6847f75822..aa35223369 100755 --- a/t/t2013-checkout-submodule.sh +++ b/t/t2013-checkout-submodule.sh @@ -63,6 +63,11 @@ test_expect_success '"checkout " honors submodule.*.ignore from .git/ ! test -s actual ' +KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1 +test_submodule_switch_recursing "git checkout --recurse-submodules" + +test_submodule_forced_switch_recursing "git checkout -f --recurse-submodules" + test_submodule_switch "git checkout" test_submodule_forced_switch "git checkout -f" -- 2.12.0.rc1.16.ge4278d41a0.dirty