From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Jun 2026 02:49:16 +0000 (-0700)
Subject: Merge branch 'en/ort-harden-against-corrupt-trees' into jch
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c878d0c7cdbf12f2bbbeb371132e8fe592284c9d;p=thirdparty%2Fgit.git

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

c878d0c7cdbf12f2bbbeb371132e8fe592284c9d