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
This commit is contained in:
Junio C Hamano
2020-01-06 14:17:51 -08:00
2 changed files with 4 additions and 4 deletions

View File

@ -1542,7 +1542,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;