]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'en/ort-perf-batch-10'
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Apr 2021 20:53:33 +0000 (13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Apr 2021 20:53:33 +0000 (13:53 -0700)
Various rename detection optimization to help "ort" merge strategy
backend.

* en/ort-perf-batch-10:
  diffcore-rename: determine which relevant_sources are no longer relevant
  merge-ort: record the reason that we want a rename for a file
  diffcore-rename: add computation of number of unknown renames
  diffcore-rename: check if we have enough renames for directories early on
  diffcore-rename: only compute dir_rename_count for relevant directories
  merge-ort: record the reason that we want a rename for a directory
  merge-ort, diffcore-rename: tweak dirs_removed and relevant_source type
  diffcore-rename: take advantage of "majority rules" to skip more renames

1  2 
diffcore-rename.c
diffcore.h
merge-ort.c

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