From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Jan 2020 22:17:51 +0000 (-0800)
Subject: Merge branch 'ds/commit-graph-set-size-mult'
X-Git-Tag: v2.25.0-rc2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=037f0675875b7cba0cb6520646ba2e3a48576219;p=thirdparty%2Fgit.git

Merge branch 'ds/commit-graph-set-size-mult'

The code to write split commit-graph file(s) upon fetching computed
bogus value for the parameter used in splitting the resulting
files, which has been corrected.

* ds/commit-graph-set-size-mult:
  commit-graph: prefer default size_mult when given zero
---

037f0675875b7cba0cb6520646ba2e3a48576219
diff --cc builtin/fetch.c
index f8765b385b,0c15f347af..b4c6d921d0
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -1862,12 -1865,8 +1862,10 @@@ int cmd_fetch(int argc, const char **ar
  	string_list_clear(&list, 0);
  
  	prepare_repo_settings(the_repository);
 -	if (the_repository->settings.fetch_write_commit_graph) {
 +	if (fetch_write_commit_graph > 0 ||
 +	    (fetch_write_commit_graph < 0 &&
 +	     the_repository->settings.fetch_write_commit_graph)) {
  		int commit_graph_flags = COMMIT_GRAPH_WRITE_SPLIT;
- 		struct split_commit_graph_opts split_opts;
- 		memset(&split_opts, 0, sizeof(struct split_commit_graph_opts));
  
  		if (progress)
  			commit_graph_flags |= COMMIT_GRAPH_WRITE_PROGRESS;