]> git.ipfire.org Git - thirdparty/git.git/commit - t/t7011-skip-worktree-reading.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b9654be 1250dff)
Merge branch 'js/ort-clean-up-after-failed-merge'
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2022 20:13:14 +0000 (13:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2022 20:13:14 +0000 (13:13 -0700)
commitbac92b1f39f7b670d7b2c32c892551aa3fb5b2e5
treec00c99c6a153123393b25da11877b95d88f0483btree | snapshot
parentb9654bee995b1e6a2f106cd57e763854dbf06286commit | diff
parent1250dff32bff164e10ffdad19c0dcb5ec0db32d1commit | diff
Merge branch 'js/ort-clean-up-after-failed-merge'

Plug memory leaks in the failure code path in the "merge-ort" merge
strategy backend.

* 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.