From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Apr 2021 20:23:26 +0000 (-0700)
Subject: Merge branch 'en/ort-perf-batch-9'
X-Git-Tag: v2.32.0-rc0~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b31224e59750f515f7ceb7adab2a7609371327d;p=thirdparty%2Fgit.git

Merge branch 'en/ort-perf-batch-9'

The ort merge backend has been optimized by skipping irrelevant
renames.

* en/ort-perf-batch-9:
  diffcore-rename: avoid doing basename comparisons for irrelevant sources
  merge-ort: skip rename detection entirely if possible
  merge-ort: use relevant_sources to filter possible rename sources
  merge-ort: precompute whether directory rename detection is needed
  merge-ort: introduce wrappers for alternate tree traversal
  merge-ort: add data structures for an alternate tree traversal
  merge-ort: precompute subset of sources for which we need rename detection
  diffcore-rename: enable filtering possible rename sources
---

1b31224e59750f515f7ceb7adab2a7609371327d