fetch --negotiate-only: do not update submodules

`git fetch --negotiate-only` is an implementation detail of push
negotiation and, unlike most `git fetch` invocations, does not actually
update the main repository. Thus it should not update submodules even
if submodule recursion is enabled.

This is not just slow, it is wrong e.g. push negotiation with
"submodule.recurse=true" will cause submodules to be updated because it
invokes `git fetch --negotiate-only`.

Fix this by disabling submodule recursion if --negotiate-only was given.
Since this makes --negotiate-only and --recurse-submodules incompatible,
check for this invalid combination and die.

This does not use the "goto cleanup" introduced in the previous commit
because we want to recurse through submodules whenever a ref is fetched,
and this can happen without introducing new objects.

Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index e967ff1874c252cdd73455f73146b4419b58f9c9..f9036831898f4ea275d6682f17c17479d4fb0953 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -71,6 +71,7 @@ configuration variables documented in linkgit:git-config[1], and the
        ancestors of the provided `--negotiation-tip=*` arguments,
        which we have in common with the server.
 +
+This is incompatible with `--recurse-submodules=[yes|on-demand]`.
 Internally this is used to implement the `push.negotiate` option, see
 linkgit:git-config[1].
 

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 06e514b07e5c787a9b9eb3edf321a448c1d3c63f..dc6e6374288cd0d45a291988c6924525f9dd5c2a 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -75,6 +75,7 @@ static struct transport *gtransport;
 static struct transport *gsecondary;
 static const char *submodule_prefix = "";
 static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
+static int recurse_submodules_cli = RECURSE_SUBMODULES_DEFAULT;
 static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND;
 static int shown_url = 0;
 static struct refspec refmap = REFSPEC_INIT_FETCH;
@@ -166,7 +167,7 @@ static struct option builtin_fetch_options[] = {
                 N_("prune remote-tracking branches no longer on remote")),
        OPT_BOOL('P', "prune-tags", &prune_tags,
                 N_("prune local tags no longer on remote and clobber changed tags")),
-       OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
+       OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules_cli, N_("on-demand"),
                    N_("control recursive fetching of submodules"),
                    PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules),
        OPT_BOOL(0, "dry-run", &dry_run,
@@ -1996,6 +1997,27 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 
        argc = parse_options(argc, argv, prefix,
                             builtin_fetch_options, builtin_fetch_usage, 0);
+
+       if (recurse_submodules_cli != RECURSE_SUBMODULES_DEFAULT)
+               recurse_submodules = recurse_submodules_cli;
+
+       if (negotiate_only) {
+               switch (recurse_submodules_cli) {
+               case RECURSE_SUBMODULES_OFF:
+               case RECURSE_SUBMODULES_DEFAULT:
+                       /*
+                        * --negotiate-only should never recurse into
+                        * submodules. Skip it by setting recurse_submodules to
+                        * RECURSE_SUBMODULES_OFF.
+                        */
+                       recurse_submodules = RECURSE_SUBMODULES_OFF;
+                       break;
+
+               default:
+                       die(_("--negotiate-only and --recurse-submodules cannot be used together"));
+               }
+       }
+
        if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
                int *sfjc = submodule_fetch_jobs_config == -1
                            ? &submodule_fetch_jobs_config : NULL;

diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 7831a38ddefdc52001b37c73f1087cda2462d182..c3bd0db2f237deccd758691490ab6b20d94a15a9 100755 (executable)
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -229,6 +229,18 @@ test_expect_success 'push with negotiation proceeds anyway even if negotiation f
        test_i18ngrep "push negotiation failed" err
 '
 
+test_expect_success 'push with negotiation does not attempt to fetch submodules' '
+       mk_empty submodule_upstream &&
+       test_commit -C submodule_upstream submodule_commit &&
+       git submodule add ./submodule_upstream submodule &&
+       mk_empty testrepo &&
+       git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
+       test_commit -C testrepo unrelated_commit &&
+       git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
+       git -c submodule.recurse=true -c protocol.version=2 -c push.negotiate=1 push testrepo refs/heads/main:refs/remotes/origin/main 2>err &&
+       ! grep "Fetching submodule" err
+'
+
 test_expect_success 'push without wildcard' '
        mk_empty testrepo &&
 

diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index 78f85b0714acbc9064199cec25f634370a58d36f..3f3ad24299039d1b33b556df1ca67fe853cab707 100755 (executable)
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -628,6 +628,18 @@ test_expect_success 'usage: --negotiate-only without --negotiation-tip' '
        test_cmp err.expect err.actual
 '
 
+test_expect_success 'usage: --negotiate-only with --recurse-submodules' '
+       cat >err.expect <<-\EOF &&
+       fatal: --negotiate-only and --recurse-submodules cannot be used together
+       EOF
+
+       test_must_fail git -c protocol.version=2 -C client fetch \
+               --negotiate-only \
+               --recurse-submodules \
+               origin 2>err.actual &&
+       test_cmp err.expect err.actual
+'
+
 test_expect_success 'file:// --negotiate-only' '
        SERVER="server" &&
        URI="file://$(pwd)/server" &&