summaryrefslogtreecommitdiff
path: root/builtin/fetch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-01-06 22:17:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-06 22:17:51 (GMT)
commit037f0675875b7cba0cb6520646ba2e3a48576219 (patch)
tree44f09f37a510a51d44d90617e8181723e43161cf /builtin/fetch.c
parentf25f04edca757b9f44ce37186e22ffeca1e2edfa (diff)
parent63020f175fe26f3250ac8d19d02ef9ee271006e5 (diff)
downloadgit-037f0675875b7cba0cb6520646ba2e3a48576219.zip
git-037f0675875b7cba0cb6520646ba2e3a48576219.tar.gz
git-037f0675875b7cba0cb6520646ba2e3a48576219.tar.bz2
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
Diffstat (limited to 'builtin/fetch.c')
-rw-r--r--builtin/fetch.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index f8765b3..b4c6d92 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1866,15 +1866,13 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
(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;
write_commit_graph_reachable(get_object_directory(),
commit_graph_flags,
- &split_opts);
+ NULL);
}
close_object_store(the_repository->objects);