diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-20 08:33:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-20 08:33:28 -0700 |
| commit | 85d6e28a620c91c5c789b38271a662b384269d46 (patch) | |
| tree | cbb509635a4a611341cc8a9392d6237179d48a9a | |
| parent | 55df1a69d76ec32553419adf9f8285f26cec964d (diff) | |
| parent | 3af029c484fc72f546078966af538db55933e83d (diff) | |
| download | git-85d6e28a620c91c5c789b38271a662b384269d46.tar.xz | |
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()
| -rw-r--r-- | progress.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/progress.c b/progress.c index 6d2dcff0b6..3eda914518 100644 --- a/progress.c +++ b/progress.c @@ -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")); } |