diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:03:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:03:13 -0700 |
| commit | 947604ddb7fffd6be6aa34192360ec338079dd6a (patch) | |
| tree | 41879c3fc3d696277a6bc01ebea14d93cb6476a7 | |
| parent | 9de14c71f720b1da50c95309fc06d30c8455aae2 (diff) | |
| parent | 15184ae9da1474908060a5c9b8c6ca88891e415e (diff) | |
| download | git-947604ddb7fffd6be6aa34192360ec338079dd6a.tar.gz | |
Merge branch 'ew/fetch-no-write-fetch-head-fix'
* ew/fetch-no-write-fetch-head-fix:
fetch: pass --no-write-fetch-head to subprocesses
| -rw-r--r-- | builtin/fetch.c | 2 | ||||
| -rwxr-xr-x | t/t5514-fetch-multiple.sh | 7 | ||||
| -rwxr-xr-x | t/t5526-fetch-submodules.sh | 13 |
3 files changed, 22 insertions, 0 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index bf627e0412..7221e57f35 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1883,6 +1883,8 @@ static void add_options_to_argv(struct strvec *argv) strvec_push(argv, "--ipv4"); else if (family == TRANSPORT_FAMILY_IPV6) strvec_push(argv, "--ipv6"); + if (!write_fetch_head) + strvec_push(argv, "--no-write-fetch-head"); } /* Fetch multiple remotes in parallel */ diff --git a/t/t5514-fetch-multiple.sh b/t/t5514-fetch-multiple.sh index 54f422ced3..98f034aa77 100755 --- a/t/t5514-fetch-multiple.sh +++ b/t/t5514-fetch-multiple.sh @@ -58,6 +58,13 @@ test_expect_success 'git fetch --all' ' test_cmp expect output) ' +test_expect_success 'git fetch --all --no-write-fetch-head' ' + (cd test && + rm -f .git/FETCH_HEAD && + git fetch --all --no-write-fetch-head && + test_path_is_missing .git/FETCH_HEAD) +' + test_expect_success 'git fetch --all should continue if a remote has errors' ' (git clone one test2 && cd test2 && diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh index b9546ef8e5..dcdbe26a08 100755 --- a/t/t5526-fetch-submodules.sh +++ b/t/t5526-fetch-submodules.sh @@ -167,6 +167,19 @@ test_expect_success "fetch --recurse-submodules recurses into submodules" ' verify_fetch_result actual.err ' +test_expect_success "fetch --recurse-submodules honors --no-write-fetch-head" ' + ( + cd downstream && + git submodule foreach --recursive \ + sh -c "cd \"\$(git rev-parse --git-dir)\" && rm -f FETCH_HEAD" && + + git fetch --recurse-submodules --no-write-fetch-head && + + git submodule foreach --recursive \ + sh -c "cd \"\$(git rev-parse --git-dir)\" && ! test -f FETCH_HEAD" + ) +' + test_expect_success "submodule.recurse option triggers recursive fetch" ' add_submodule_commits && ( |