Skip to content

Commit 5da7329

Browse files
committed
Merge branch 'rs/commit-graph-code-simplification'
Code simplfication. * rs/commit-graph-code-simplification: commit-graph: use progress title directly
2 parents 0108fc1 + d68ce90 commit 5da7329

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

commit-graph.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1657,19 +1657,15 @@ static void merge_commit_graphs(struct write_commit_graph_context *ctx)
16571657
{
16581658
struct commit_graph *g = ctx->r->objects->commit_graph;
16591659
uint32_t current_graph_number = ctx->num_commit_graphs_before;
1660-
struct strbuf progress_title = STRBUF_INIT;
16611660

16621661
while (g && current_graph_number >= ctx->num_commit_graphs_after) {
16631662
current_graph_number--;
16641663

1665-
if (ctx->report_progress) {
1666-
strbuf_addstr(&progress_title, _("Merging commit-graph"));
1667-
ctx->progress = start_delayed_progress(progress_title.buf, 0);
1668-
}
1664+
if (ctx->report_progress)
1665+
ctx->progress = start_delayed_progress(_("Merging commit-graph"), 0);
16691666

16701667
merge_commit_graph(ctx, g);
16711668
stop_progress(&ctx->progress);
1672-
strbuf_release(&progress_title);
16731669

16741670
g = g->base_graph;
16751671
}

0 commit comments

Comments
 (0)