diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-05-17 22:58:50 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-05-17 22:58:50 +0900 |
| commit | fc35bafc6f9a423a0008d647b43bc8b53b15b2cb (patch) | |
| tree | c0856b9e00e3862eaec84cb3cd535f6190bd10d3 /t/t4013/diff.format-patch_--inline_--stdout_initial..main^ | |
| parent | 91b68bbb3be67da96b541eb779dd47de02c71595 (diff) | |
| parent | 60826fdeb137a61e6ae8b80d70509d2bc094f8a5 (diff) | |
| download | git-fc35bafc6f9a423a0008d647b43bc8b53b15b2cb.tar.gz git-fc35bafc6f9a423a0008d647b43bc8b53b15b2cb.zip | |
Merge branch 'en/ort-harden-against-corrupt-trees' into jch
"ort" merge backend handles merging corrupt trees better by
aborting when it should.
* en/ort-harden-against-corrupt-trees:
cache-tree: fix verify_cache() to catch non-adjacent D/F conflicts
merge-ort: abort merge when trees have duplicate entries
merge-ort: free diff pairs queue in clear_or_reinit_internal_opts()
merge-ort: drop unnecessary show_all_errors from collect_merge_info()
merge-ort: propagate callback errors from traverse_trees_wrapper()
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..main^')
0 files changed, 0 insertions, 0 deletions