Merge branch 'cw/fetch-remote-group-with-duplication'

gitster · gitster · commit d26e26a3f506 · 2023-01-27T08:51:41.000-08:00
"git fetch &lt;group&gt;", when "&lt;group&gt;" of remotes lists the same
remote twice, unnecessarily failed when parallel fetching was
enabled, which has been corrected.

* cw/fetch-remote-group-with-duplication:
  fetch: fix duplicate remote parallel fetch bug
diff --git a/builtin/fetch.c b/builtin/fetch.c
@@ -2228,6 +2228,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 			argv++;
 		}
 	}
+	string_list_remove_duplicates(&list, 0);
 
 	if (negotiate_only) {
 		struct oidset acked_commits = OIDSET_INIT;
diff --git a/t/t5506-remote-groups.sh b/t/t5506-remote-groups.sh
@@ -99,4 +99,13 @@ test_expect_success 'updating remote name updates that remote' '
 	! 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

Original file line number	Diff line number	Diff line change
`@@ -2228,6 +2228,7 @@ int cmd_fetch(int argc, const char *argv, const char prefix)`
`2228`	`2228`	`argv++;`
`2229`	`2229`	`}`
`2230`	`2230`	`}`
	`2231`	`+ string_list_remove_duplicates(&list, 0);`
`2231`	`2232`
`2232`	`2233`	`if (negotiate_only) {`
`2233`	`2234`	`struct oidset acked_commits = OIDSET_INIT;`