Skip to content

Commit 6eb0c0e

Browse files
peffgitster
authored andcommitted
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 64aceb6 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fce9ffb commit 6eb0c0e

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

merge-ort.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4880,8 +4880,7 @@ static void merge_start(struct merge_options *opt, struct merge_result *result)
48804880
trace2_region_leave("merge", "allocate/init", opt->repo);
48814881
}
48824882

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,
48854884
struct tree *merge_base,
48864885
struct tree *side1,
48874886
struct tree *side2)
@@ -5083,7 +5082,7 @@ void merge_incore_nonrecursive(struct merge_options *opt,
50835082

50845083
trace2_region_enter("merge", "merge_start", opt->repo);
50855084
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);
50875086
merge_start(opt, result);
50885087
/*
50895088
* Record the trees used in this merge, so if there's a next merge in

0 commit comments

Comments
 (0)