merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()
The merge_options parameter has never been used since the function was introduced in 64aceb6d73 (merge-ort: add code to check for whether cached renames can be reused, 2021-05-20). In theory some merge options might impact our decisions here, but that has never been the case so far. Let's drop it to appease -Wunused-parameter; it would be easy to add back later if we need to (there is only one caller). 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:40 UTC
6eb0c0eb7ac23da7d3bc437b7a5c31f628c25531
1 file changed
+2
-3
merge-ort.c
+2
-3
@@ -4880,8 +4880,7 @@ static void merge_start(struct merge_options *opt, struct merge_result *result)
4880
trace2_region_leave("merge", "allocate/init", opt->repo);
4881
}
4882
4883
-static void merge_check_renames_reusable(struct merge_options *opt,
4884
- struct merge_result *result,
4883
+static void merge_check_renames_reusable(struct merge_result *result,
4884
struct tree *merge_base,
4885
struct tree *side1,
4886
struct tree *side2)
@@ -5083,7 +5082,7 @@ void merge_incore_nonrecursive(struct merge_options *opt,
5082
5083
trace2_region_enter("merge", "merge_start", opt->repo);
5084
assert(opt->ancestor != NULL);
5086
- merge_check_renames_reusable(opt, result, merge_base, side1, side2);
5085
+ merge_check_renames_reusable(result, merge_base, side1, side2);
5086
merge_start(opt, result);
5087
/*
5088
* Record the trees used in this merge, so if there's a next merge in