Merge branch 'ds/trace-log-progress-fix'

Last-minute fix for our recent change to allow use of progress API
as a traceable region.

* ds/trace-log-progress-fix:
  progress: call trace2_region_leave() only after calling _enter()
This commit is contained in:
Junio C Hamano 2020-05-20 08:33:28 -07:00
commit 85d6e28a62

View file

@ -329,13 +329,9 @@ void stop_progress(struct progress **p_progress)
trace2_data_intmax("progress", the_repository,
"total_bytes",
(*p_progress)->throughput->curr_total);
}
trace2_region_leave("progress",
p_progress && *p_progress
? (*p_progress)->title
: NULL,
the_repository);
trace2_region_leave("progress", (*p_progress)->title, the_repository);
}
stop_progress_msg(p_progress, _("done"));
}