fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph

dscho · gitster · commit 7d8e72b97000 · 2019-11-06T10:59:37.000+09:00
When both `fetch.jobs` and `fetch.writeCommitGraph` is set, we currently
try to write the commit graph in each of the concurrent fetch jobs,
which frequently leads to error messages like this one:

fatal: Unable to create '.../.git/objects/info/commit-graphs/commit-graph-chain.lock': File exists.

Let's avoid this by holding off from writing the commit graph until all
fetch jobs are done.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/fetch.c b/builtin/fetch.c
@@ -1602,7 +1602,8 @@ static int fetch_multiple(struct string_list *list, int max_children)
 			return errcode;
 	}
 
-	argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc", NULL);
+	argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc",
+			"--no-write-commit-graph", NULL);
 	add_options_to_argv(&argv);
 
 	if (max_children != 1 && list->nr != 1) {

Original file line number	Diff line number	Diff line change
`@@ -1602,7 +1602,8 @@ static int fetch_multiple(struct string_list *list, int max_children)`
`1602`	`1602`	`return errcode;`
`1603`	`1603`	`}`
`1604`	`1604`
`1605`		`- argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc", NULL);`
	`1605`	`+ argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc",`
	`1606`	`+ "--no-write-commit-graph", NULL);`
`1606`	`1607`	`add_options_to_argv(&argv);`
`1607`	`1608`
`1608`	`1609`	`if (max_children != 1 && list->nr != 1) {`