]> git.99rst.org Git - git.git/commit
git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 359da65)
merge-ort: clean up after failed merge
authorJohannes Schindelin <redacted>
Fri, 29 Jul 2022 17:12:06 +0000 (17:12 +0000)
committerJunio C Hamano <redacted>
Mon, 1 Aug 2022 02:24:13 +0000 (19:24 -0700)
commitfef2b6dace192865f8552b54d2053cba52f31a66
tree81422bb96e96e3c80aa050a71d8b716345a65e7ctree
parent359da658ae32d9a7e5e93ac173fc221352b62917commit | 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 <redacted>
Reviewed-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-ort.c diff | blob | history
git clone https://git.99rst.org/PROJECT