diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-10 01:20:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-10 01:20:58 +0300 |
| commit | 87bfbd52e21b6e9373cd70fc148f09dcdad39f09 (patch) | |
| tree | 8c2c72ce24dafbb91c6140536851e2570a535698 /merge-ort.c | |
| parent | e1c192d387ef27b3cf297688625d3f49e0068563 (diff) | |
| parent | 9ae39fef7f3764537e029b57687f6a0a3163e810 (diff) | |
Merge branch 'en/merge-ort-restart-optim-fix'
The merge-ort misbehaved when merge.renameLimit configuration is
set too low and failed to find all renames.
* en/merge-ort-restart-optim-fix:
merge-ort: avoid assuming all renames detected
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/merge-ort.c b/merge-ort.c index c319797021..b0ff9a7287 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -3060,6 +3060,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; |