This depends on a merge of en/ort-conflict-handling, en/diffcore-rename,
and en/ort-directory-rename.
Changes since v1:
* Add a step I forgot in my testcase setup -- increasing
merge.renameLimit
* Add Acked-by from Taylor
Elijah Newren (1):
merge-ort: begin performance work; instrument with trace2_region_*
calls
diffcore-rename.c | 8 +++++++
merge-ort.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+)
Range-diff:
1: 9542932eee ! 1: 8783f209ef merge-ort: begin performance work; instrument with trace2_region_* calls
@@ Commit message
$ git switch -c 5.4-renames v5.4
$ git mv drivers pilots # Introduce over 26,000 renames
$ git commit -m "Rename drivers/ to pilots/"
+ $ git config merge.renameLimit 30000
=== Testcases ===
@@ Commit message
is noticeably faster with merge-ort than with apply-based rebase.
Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
+ Acked-by: Taylor Blau <ttaylorr@xxxxxxxxxx>
## diffcore-rename.c ##
@@ diffcore-rename.c: void diffcore_rename(struct diff_options *options)
--
2.29.2.544.gecb49aa127.dirty
