diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-07-06 15:50:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-07-06 15:50:20 -0700 |
| commit | aed0faa52bfcdd79cac5b1491dc89d1051fa7ea1 (patch) | |
| tree | 391b004d349d87f12bc41fba464973950be6f177 /t/t4013/diff.diff_initial..side | |
| parent | ed5d4f6e899ff09c0852711b5918f3d740ce1669 (diff) | |
| parent | 0c8eb46fbbfc48065bc93dcc4c9901031615516c (diff) | |
Merge branch 'en/ort-harden-against-corrupt-trees'
The 'ort' merge backend has been hardened against corrupt trees by
ensuring it aborts under appropriate error conditions.
* 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.diff_initial..side')
0 files changed, 0 insertions, 0 deletions