mailinfo: factor out some repeated header handling

[thirdparty/git.git] / commit-graph.c

diff --git a/commit-graph.c b/commit-graph.c
index 79bc5641cbc0c39db05faef0d7ae5d362062794c..b205e65ed131cb2484ad150e8f4d798a5076edc4 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -1100,7 +1100,7 @@ static void compute_generation_numbers(struct write_commit_graph_context *ctx)
        struct commit_list *list = NULL;
 
        if (ctx->report_progress)
-               ctx->progress = start_progress(
+               ctx->progress = start_delayed_progress(
                                        _("Computing commit graph generation numbers"),
                                        ctx->commits.nr);
        for (i = 0; i < ctx->commits.nr; i++) {
@@ -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;