From fef2b6dace192865f8552b54d2053cba52f31a66 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 29 Jul 2022 17:12:06 +0000
Subject: [PATCH 1/2] merge-ort: clean up after failed merge
In 9fefce68dc8 (merge-ort: basic outline for merge_switch_to_result(),
2020-12-13), we added functionality to lay down the result of a merge on
disk. But we forgot to release the data structures in case
`unpack_trees()` failed to run properly.
This was pointed out by the `linux-leaks` job in our CI runs.
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 | 2 ++
1 file changed, 2 insertions(+)
diff --git a/merge-ort.c b/merge-ort.c
index c319797021..52deb36594 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -4225,6 +4225,7 @@ void merge_switch_to_result(struct merge_options *opt,
if (checkout(opt, head, result->tree)) {
/* failure to function */
result->clean = -1;
+ merge_finalize(opt, result);
return;
}
trace2_region_leave("merge", "checkout", opt->repo);
@@ -4235,6 +4236,7 @@ void merge_switch_to_result(struct merge_options *opt,
/* failure to function */
opt->priv = NULL;
result->clean = -1;
+ merge_finalize(opt, result);
return;
}
opt->priv = NULL;
From 1250dff32bff164e10ffdad19c0dcb5ec0db32d1 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 29 Jul 2022 17:12:07 +0000
Subject: [PATCH 2/2] 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>
---
merge-ort.c | 3 +++
1 file changed, 3 insertions(+)
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;