summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builtin/fetch.c4
-rw-r--r--commit-graph.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 863c858fde..0c15f347af 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1867,15 +1867,13 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
prepare_repo_settings(the_repository);
if (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);
diff --git a/commit-graph.c b/commit-graph.c
index 0aea7b2ae5..baa1a266b4 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -1545,7 +1545,9 @@ static void split_graph_merge_strategy(struct write_commit_graph_context *ctx)
if (ctx->split_opts) {
max_commits = ctx->split_opts->max_commits;
- size_mult = ctx->split_opts->size_multiple;
+
+ if (ctx->split_opts->size_multiple)
+ size_mult = ctx->split_opts->size_multiple;
}
g = ctx->r->objects->commit_graph;