diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2022-07-29 19:12:07 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-01 04:24:27 +0200 |
| commit | 1250dff32bff164e10ffdad19c0dcb5ec0db32d1 (patch) | |
| tree | 128d6ed675dbffe3dff30b0cd0fbdb928b5ef40b /merge-ort.c | |
| parent | merge-ort: clean up after failed merge (diff) | |
| download | git-1250dff32bff164e10ffdad19c0dcb5ec0db32d1.tar.xz git-1250dff32bff164e10ffdad19c0dcb5ec0db32d1.zip | |
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>
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/merge-ort.c b/merge-ort.c index 52deb36594..07f54e409f 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -4226,6 +4226,7 @@ void merge_switch_to_result(struct merge_options *opt, /* failure to function */ result->clean = -1; merge_finalize(opt, result); + trace2_region_leave("merge", "checkout", opt->repo); return; } trace2_region_leave("merge", "checkout", opt->repo); @@ -4237,6 +4238,8 @@ void merge_switch_to_result(struct merge_options *opt, opt->priv = NULL; result->clean = -1; merge_finalize(opt, result); + trace2_region_leave("merge", "record_conflicted", + opt->repo); return; } opt->priv = NULL; |