Am 27.02.20 um 07:50 schrieb Derrick Stolee:
> On 2/20/2020 1:49 PM, René Scharfe wrote:
>> Subject: [PATCH] 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@xxxxxx>
>> ---
>> commit-graph.c | 8 ++------
>> 1 file changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/commit-graph.c b/commit-graph.c
>> index 656dd647d5..f013a84e29 100644
>> --- a/commit-graph.c
>> +++ b/commit-graph.c
>> @@ -1657,19 +1657,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;
>> }
>> --
>
> Not only is this a good change, it no longer leaks memory.
> Thanks!
strbuf_release() frees the allocated memory, so I don't think the code
was leaking before. (It would have with strbuf_reset()).
René
