]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitc2d62d0c7d80b6af90a7ff63aa5909c56ea3b579
tree99027fb1fc3bc3c2764e65409b5d99028a86c10ctree | snapshot
parent4b2d41b0ad24301827be2bd494fe6cf63f76ad02commit | diff
parent1250dff32bff164e10ffdad19c0dcb5ec0db32d1commit | diff
Merge branch 'js/ort-clean-up-after-failed-merge' into maint

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
merge-ort.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.