kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'rs/commit-graph-code-simplification' 

Code simplfication.

* rs/commit-graph-code-simplification:
  commit-graph: use progress title directly
maint
Junio C Hamano 2020-03-05 10:43:04 -08:00
parent 0108fc1b46 d68ce906c7
commit 5da7329e29
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
commit-graph.c
View File

@ -1657,19 +1657,15 @@ static void merge_commit_graphs(struct write_commit_graph_context *ctx)
{ {
struct commit_graph *g = ctx->r->objects->commit_graph; struct commit_graph *g = ctx->r->objects->commit_graph;
uint32_t current_graph_number = ctx->num_commit_graphs_before; uint32_t current_graph_number = ctx->num_commit_graphs_before;
struct strbuf progress_title = STRBUF_INIT;


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


if (ctx->report_progress) { if (ctx->report_progress)
strbuf_addstr(&progress_title, _("Merging commit-graph")); ctx->progress = start_delayed_progress(_("Merging commit-graph"), 0);
ctx->progress = start_delayed_progress(progress_title.buf, 0);
}


merge_commit_graph(ctx, g); merge_commit_graph(ctx, g);
stop_progress(&ctx->progress); stop_progress(&ctx->progress);
strbuf_release(&progress_title);


g = g->base_graph; g = g->base_graph;
} }