]> git.99rst.org Git - git.git/commit
git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fef2b6d)
merge-ort: do leave trace2 region even if checkout fails
authorJohannes Schindelin <redacted>
Fri, 29 Jul 2022 17:12:07 +0000 (17:12 +0000)
committerJunio C Hamano <redacted>
Mon, 1 Aug 2022 02:24:27 +0000 (19:24 -0700)
commit1250dff32bff164e10ffdad19c0dcb5ec0db32d1
tree128d6ed675dbffe3dff30b0cd0fbdb928b5ef40btree
parentfef2b6dace192865f8552b54d2053cba52f31a66commit | diff
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 <redacted>
Signed-off-by: Johannes Schindelin <redacted>
Reviewed-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-ort.c diff | blob | history
git clone https://git.99rst.org/PROJECT