merge-ort: drop unused parameters from detect_and_process_renames()
This function takes three trees representing the merge base and both sides of the merge, but never looks at any of them. This is due to f78cf97617 (merge-ort: call diffcore_rename() directly, 2021-02-14). Prior to that commit, we passed pairs of trees to diff_tree_oid(). But after that commit, we collect a custom diff_queue for each pair in the merge_options struct, and just run diffcore_rename() on the result. So the function does not need to know about the original trees at all anymore. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Sep 14, 2023 at 05:39 UTC
fce9ffb2253660346c826a969c2b49a485e70cbd
1 file changed
+2
-6
merge-ort.c
+2
-6
@@ -3324,10 +3324,7 @@ static int collect_renames(struct merge_options *opt,
3324
return clean;
3325
}
3326
3327
-static int detect_and_process_renames(struct merge_options *opt,
3328
- struct tree *merge_base,
3329
- struct tree *side1,
3330
- struct tree *side2)
3327
+static int detect_and_process_renames(struct merge_options *opt)
3328
{
3329
struct diff_queue_struct combined = { 0 };
3330
struct rename_info *renames = &opt->priv->renames;
@@ -4964,8 +4961,7 @@ redo:
4961
trace2_region_leave("merge", "collect_merge_info", opt->repo);
4962
4963
trace2_region_enter("merge", "renames", opt->repo);
4967
- result->clean = detect_and_process_renames(opt, merge_base,
4968
- side1, side2);
4964
+ result->clean = detect_and_process_renames(opt);
4965
trace2_region_leave("merge", "renames", opt->repo);
4966
if (opt->priv->renames.redo_after_renames == 2) {
4967
trace2_region_enter("merge", "reset_maps", opt->repo);