]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3199b22) | patch
merge-recursive: fix memory leak when finalizing merge
authorPatrick Steinhardt <ps@pks.im>
Tue, 11 Jun 2024 09:20:14 +0000 (11:20 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2024 20:15:06 +0000 (13:15 -0700)
commit8ff6bd47500dcd55d278fdbfe77fe838cc8dd3b1
tree4e910d4a9f8e166bf2c66a21abe50123bdaf413btree | snapshot
parent3199b22e7d8cf8a95b7fac4e4aaf65638256b226commit | diff
merge-recursive: fix memory leak when finalizing merge

We do not free some members of `struct merge_options`' private data.
Fix this to plug those leaks.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | blame | history
t/t1004-read-tree-m-u-wf.sh diff | blob | blame | history
t/t1015-read-index-unmerged.sh diff | blob | blame | history
t/t3509-cherry-pick-merge-df.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.