Skip to content

Commit 85d6e28

Browse files
committed
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()
2 parents 55df1a6 + 3af029c commit 85d6e28

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

progress.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -329,13 +329,9 @@ void stop_progress(struct progress **p_progress)
329329
trace2_data_intmax("progress", the_repository,
330330
"total_bytes",
331331
(*p_progress)->throughput->curr_total);
332-
}
333332

334-
trace2_region_leave("progress",
335-
p_progress && *p_progress
336-
? (*p_progress)->title
337-
: NULL,
338-
the_repository);
333+
trace2_region_leave("progress", (*p_progress)->title, the_repository);
334+
}
339335

340336
stop_progress_msg(p_progress, _("done"));
341337
}

0 commit comments

Comments
 (0)