Merge branch 'ds/fetch-bundle-uri-with-all'

"git fetch --all" does not have to download and handle the same
bundleURI over and over, which has been corrected.

* ds/fetch-bundle-uri-with-all:
  fetch: download bundles once, even with --all

1 files changed, 6 insertions, 1 deletions

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 662a842479..85bd280103 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1967,7 +1967,12 @@ static int fetch_multiple(struct string_list *list, int max_children)
 			return errcode;
 	}
 
-	strvec_pushl(&argv, "fetch", "--append", "--no-auto-gc",
+	/*
+	 * Cancel out the fetch.bundleURI config when running subprocesses,
+	 * to avoid fetching from the same bundle list multiple times.
+	 */
+	strvec_pushl(&argv, "-c", "fetch.bundleURI=",
+		     "fetch", "--append", "--no-auto-gc",
 		     "--no-write-commit-graph", NULL);
 	add_options_to_argv(&argv);