From: Mike Crowe Date: Wed, 02 Dec 2015 09:56:12 GMT Subject: [PATCH] push: Improve --recurse-submodules support Message-ID: <1449050172-1119-1-git-send-email-mac@mcrowe.com> In-Reply-To: <20151202095451.GA22568@mcrowe.com> b33a15b08131514b593015cb3e719faf9db20208 added support for the push.recurseSubmodules config option. After it was merged Junio C Hamano suggested some improvements: - Declare recurse_submodules on a separate line. - Accept multiple --recurse-submodules options on command line with the last one winning. (This simplified the implementation too.) Also slightly improve one of the tests added in b33a15b08131514b593015cb3e719faf9db20208. Signed-off-by: Mike Crowe --- builtin/push.c | 12 +++--------- t/t5531-deep-submodule-push.sh | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index f9b59b4..cc29277 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -21,7 +21,8 @@ static int thin = 1; static int deleterefs; static const char *receivepack; static int verbosity; -static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT; +static int progress = -1; +static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT; static struct push_cas_option cas; @@ -455,9 +456,6 @@ static int option_parse_recurse_submodules(const struct option *opt, { int *recurse_submodules = opt->value; - if (*recurse_submodules != RECURSE_SUBMODULES_DEFAULT) - die("%s can only be used once.", opt->long_name); - if (unset) *recurse_submodules = RECURSE_SUBMODULES_OFF; else if (arg) @@ -532,7 +530,6 @@ int cmd_push(int argc, const char **argv, const char *prefix) int flags = 0; int tags = 0; int push_cert = -1; - int recurse_submodules_from_cmdline = RECURSE_SUBMODULES_DEFAULT; int rc; const char *repo = NULL; /* default repository */ struct option options[] = { @@ -550,7 +547,7 @@ int cmd_push(int argc, const char **argv, const char *prefix) 0, CAS_OPT_NAME, &cas, N_("refname>:recurse-check-on-command-line-overriding-config && @@ -142,8 +142,38 @@ test_expect_success 'push fails if submodule commit not on remote using check fr git fetch ../pub.git && git diff --quiet FETCH_HEAD master^ && # Check that the submodule commit did not get there - cd gar/bage && - git diff --quiet origin/master master^ + (cd gar/bage && git diff --quiet origin/master master^) && + # Now try the reverse which should succeed + git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git master && + git fetch ../pub.git && + git diff --quiet FETCH_HEAD master && + (cd gar/bage && git diff --quiet origin/master master) + ) +' + +test_expect_success 'push recurse-submodules on cmdline overrides earlier cmdline' ' + ( + cd work/gar/bage && + >recurse-check-on-command-line-overriding-earlier-command-line && + git add recurse-check-on-command-line-overriding-earlier-command-line && + git commit -m "Recurse on command-line overridiing earlier command-line junk" + ) && + ( + cd work && + git add gar/bage && + git commit -m "Recurse on command-line overriding earlier command-line for gar/bage" && + test_must_fail git push --recurse-submodules=on-demand --recurse-submodules=check ../pub.git master && + # Check that the supermodule commit did not get there + git fetch ../pub.git && + git diff FETCH_HEAD master^ && + git diff --quiet FETCH_HEAD master^ && + # Check that the submodule commit did not get there + (cd gar/bage && git diff --quiet origin/master master^) && + # But the options in the other order should push the submodule + git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git master && + # Check that the submodule commit did get there + git fetch ../pub.git && + (cd gar/bage && git diff --quiet origin/master master) ) ' -- 2.1.4