summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2022-07-29 17:12:06 +0000
committerJunio C Hamano <gitster@pobox.com>2022-07-31 19:24:13 -0700
commitfef2b6dace192865f8552b54d2053cba52f31a66 (patch)
tree81422bb96e96e3c80aa050a71d8b716345a65e7c /commit.c
parent359da658ae32d9a7e5e93ac173fc221352b62917 (diff)
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions