diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-01-07 01:17:51 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-07 01:17:51 +0300 |
| commit | 037f0675875b7cba0cb6520646ba2e3a48576219 (patch) | |
| tree | 44f09f37a510a51d44d90617e8181723e43161cf /commit-graph.c | |
| parent | f25f04edca757b9f44ce37186e22ffeca1e2edfa (diff) | |
| parent | 63020f175fe26f3250ac8d19d02ef9ee271006e5 (diff) | |
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 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/commit-graph.c b/commit-graph.c index e771394aff..b205e65ed1 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -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; |