| commit | 1250dff32bff164e10ffdad19c0dcb5ec0db32d1 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Fri, 29 Jul 2022 17:12:07 +0000 (29 17:12 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Aug 2022 02:24:27 +0000 (31 19:24 -0700) | ||
| tree | 128d6ed675dbffe3dff30b0cd0fbdb928b5ef40b | treesnapshot (tar.gz zip) |
| parent | fef2b6dace192865f8552b54d2053cba52f31a66 | commitdiff |
merge-ort: do leave trace2 region even if checkout fails
In 557ac0350d9 (merge-ort: begin performance work; instrument with
trace2_region_* calls, 2021-01-23), we added Trace2 instrumentation, but
in the error path that returns early, we forgot to tell Trace2 that
we're leaving the region. Let's fix that.
Pointed-out-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In 557ac0350d9 (merge-ort: begin performance work; instrument with
trace2_region_* calls, 2021-01-23), we added Trace2 instrumentation, but
in the error path that returns early, we forgot to tell Trace2 that
we're leaving the region. Let's fix that.
Pointed-out-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-ort.c | diffblobblamehistory |