]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b2d41b 1250dff)
Merge branch 'js/ort-clean-up-after-failed-merge' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Aug 2022 18:13:11 +0000 (11:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Aug 2022 18:13:11 +0000 (11:13 -0700)
Plug memory leaks in the failure code path in the "merge-ort" merge
strategy backend.
source: <pull.1307.v2.git.1659114727.gitgitgadget@gmail.com>

* js/ort-clean-up-after-failed-merge:
  merge-ort: do leave trace2 region even if checkout fails
  merge-ort: clean up after failed merge

1  2 
merge-ort.c patch | diff1 | diff2 | blob | history

diff --cc merge-ort.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.