зеркало из https://github.com/microsoft/git.git
commit-graph: use progress title directly
merge_commit_graphs() copies the (translated) progress message into a strbuf and passes the copy to start_delayed_progress() at each loop iteration. The latter function takes a string pointer, so let's avoid the detour and hand the string to it directly. That's shorter, simpler and slightly more efficient. Signed-off-by: René Scharfe <l.s.r@web.de> Acked-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
1771be90c8
Коммит
d68ce906c7
|
@ -1590,19 +1590,15 @@ static void merge_commit_graphs(struct write_commit_graph_context *ctx)
|
|||
{
|
||||
struct commit_graph *g = ctx->r->objects->commit_graph;
|
||||
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) {
|
||||
current_graph_number--;
|
||||
|
||||
if (ctx->report_progress) {
|
||||
strbuf_addstr(&progress_title, _("Merging commit-graph"));
|
||||
ctx->progress = start_delayed_progress(progress_title.buf, 0);
|
||||
}
|
||||
if (ctx->report_progress)
|
||||
ctx->progress = start_delayed_progress(_("Merging commit-graph"), 0);
|
||||
|
||||
merge_commit_graph(ctx, g);
|
||||
stop_progress(&ctx->progress);
|
||||
strbuf_release(&progress_title);
|
||||
|
||||
g = g->base_graph;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче