Message ID | 6b20977a5a811e3f3038aec58f615b621139f24b.1614484707.git.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | Optimization batch 9: avoid detecting irrelevant renames | expand |
diff --git a/merge-ort.c b/merge-ort.c index 27acaa7380be..66892c63cee2 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -2209,7 +2209,7 @@ static void detect_regular_renames(struct merge_options *opt, diff_queued_diff = renames->pairs[side_index]; trace2_region_enter("diff", "diffcore_rename", opt->repo); diffcore_rename_extended(&diff_opts, - NULL, + &renames->relevant_sources[side_index], &renames->dirs_removed[side_index], &renames->dir_rename_count[side_index]); trace2_region_leave("diff", "diffcore_rename", opt->repo);