From 9ae39fef7f3764537e029b57687f6a0a3163e810 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Mon, 17 Jan 2022 18:25:55 +0000 Subject: merge-ort: avoid assuming all renames detected In commit 8b09a900a1 ("merge-ort: restart merge with cached renames to reduce process entry cost", 2021-07-16), we noted that in the merge-ort steps of collect_merge_info() detect_and_process_renames() process_entries() that process_entries() was expensive, and we could often make it cheaper by changing this to collect_merge_info() detect_and_process_renames() collect_merge_info() detect_and_process_renames() process_entries() because the second collect_merge_info() would be cheaper (we could avoid traversing into some directories), the second detect_and_process_renames() would be free since we had already detected all renames, and then process_entries() has far fewer entries to handle. However, this was built on the assumption that the first detect_and_process_renames() actually detected all potential renames. If someone has merge.renameLimit set to some small value, that assumption is violated which manifests later with the following message: $ git -c merge.renameLimit=1 rebase upstream ... git: merge-ort.c:546: clear_or_reinit_internal_opts: Assertion `renames->cached_pairs_valid_side == 0' failed. Turn off this cache-renames-and-restart whenever we cannot detect all renames, and add a testcase that would have caught this problem. Reported-by: Taylor Blau Signed-off-by: Elijah Newren Tested-by: Taylor Blau Signed-off-by: Junio C Hamano --- merge-ort.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'merge-ort.c') diff --git a/merge-ort.c b/merge-ort.c index b346e23ff2..7b2c0e9ee2 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -3031,6 +3031,10 @@ static int detect_and_process_renames(struct merge_options *opt, trace2_region_enter("merge", "regular renames", opt->repo); detection_run |= detect_regular_renames(opt, MERGE_SIDE1); detection_run |= detect_regular_renames(opt, MERGE_SIDE2); + if (renames->needed_limit) { + renames->cached_pairs_valid_side = 0; + renames->redo_after_renames = 0; + } if (renames->redo_after_renames && detection_run) { int i, side; struct diff_filepair *p; -- cgit v1.2.3