]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'en/ort-perf-batch-9'
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 Apr 2021 20:23:26 +0000 (13:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Apr 2021 20:23:26 +0000 (13:23 -0700)
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

1  2 
diffcore-rename.c
diffcore.h
merge-ort.c
t/t6423-merge-rename-directories.sh

Simple merge
diff --cc diffcore.h
Simple merge
diff --cc merge-ort.c
Simple merge
Simple merge