diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-04-06 23:38:32 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-04-06 23:38:32 +0300 |
commit | 89833fc249189d5b91509b1b3f16b26aade9e7f7 (patch) | |
tree | 903a1a2e754e023eb2ad8ccdff2d8b6b75a91846 /builtin/fetch.c | |
parent | c5305bbe322edfadd746c162f8af090a227019b7 (diff) | |
parent | 25bccb4b79dce1d5c259228ef3c91eadcd13d8ac (diff) |
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
Diffstat (limited to 'builtin/fetch.c')
-rw-r--r-- | builtin/fetch.c | 7 |
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); |