undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch: fix duplicate remote parallel fetch bug

Browse Source 
Fetching in parallel from a remote group with a duplicated remote results
in the following:

error: cannot lock ref '<ref>': is at <oid> but expected <oid>

This doesn't happen in serial since fetching from the same remote that
has already been fetched from is a noop. Therefore, remove any duplicated
remotes after remote groups are parsed.

Signed-off-by: Calvin Wan <calvinwan@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Calvin Wan 2023-01-19 22:05:38 +00:00 committed by Junio C Hamano
parent 844ede312b
commit 06a668cb90
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/fetch.c
View File

@ -2228,6 +2228,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
argv++; argv++;
} }
} }
string_list_remove_duplicates(&list, 0);
if (negotiate_only) { if (negotiate_only) {
struct oidset acked_commits = OIDSET_INIT; struct oidset acked_commits = OIDSET_INIT;

9
t/t5506-remote-groups.sh
View File

@ -99,4 +99,13 @@ test_expect_success 'updating remote name updates that remote' '
! repo_fetched two ! repo_fetched two
' '
test_expect_success 'updating group in parallel with a duplicate remote does not fail (fetch)' '
mark fetch-group-duplicate &&
update_repo one &&
git config --add remotes.duplicate one &&
git config --add remotes.duplicate one &&
git -c fetch.parallel=2 remote update duplicate &&
repo_fetched one
'
test_done test_done