From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Jul 2026 22:50:20 +0000 (-0700)
Subject: Merge branch 'en/ort-harden-against-corrupt-trees'
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=aed0faa52bfcdd79cac5b1491dc89d1051fa7ea1;p=thirdparty%2Fgit.git

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()
---

aed0faa52bfcdd79cac5b1491dc89d1051fa7ea1