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>
Johannes Schindelin committed
Jul 29, 2022 at 17:12 UTC
1250dff32bff164e10ffdad19c0dcb5ec0db32d1
1 file changed
+3
merge-ort.c
+3
@@ -4226,6 +4226,7 @@ void merge_switch_to_result(struct merge_options *opt,
4226
/* failure to function */
4227
result->clean = -1;
4228
merge_finalize(opt, result);
4229
+ trace2_region_leave("merge", "checkout", opt->repo);
4230
return;
4231
}
4232
trace2_region_leave("merge", "checkout", opt->repo);
@@ -4237,6 +4238,8 @@ void merge_switch_to_result(struct merge_options *opt,
4238
opt->priv = NULL;
4239
result->clean = -1;
4240
merge_finalize(opt, result);
4241
+ trace2_region_leave("merge", "record_conflicted",
4242
+ opt->repo);
4243
return;
4244
}
4245
opt->priv = NULL;