From: Johannes Schindelin Date: Fri, 29 Jul 2022 17:12:06 +0000 (+0000) Subject: merge-ort: clean up after failed merge X-Git-Tag: v2.37.3~10^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fef2b6dace192865f8552b54d2053cba52f31a66;p=thirdparty%2Fgit.git 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 Reviewed-by: Elijah Newren Signed-off-by: Junio C Hamano --- 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;