[PATCH v2 1/2] merge-ort: clean up after failed merge
- From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Jul 29, 2022, 17:12 UTC
- Message-ID
- <082c7ffa41f241c61ae2fe5ab763fb09c680a17b.1659114727.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1307.v2.git.1659114727.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
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> --- merge-ort.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/merge-ort.c b/merge-ort.c index 931b91438cf..e820e45a8e8 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -3157,6 +3157,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); @@ -3167,6 +3168,7 @@ void merge_switch_to_result(struct merge_options *opt, &opti->conflicted)) { /* failure to function */ result->clean = -1; + merge_finalize(opt, result); return; } trace2_region_leave("merge", "record_conflicted", opt->repo);
-- gitgitgadget