On Thu, Sep 14, 2023 at 2:40 AM Jeff King <peff@xxxxxxxx> wrote:
>
> 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.
Yeah, it was used in some preliminary versions of the code while I was
developing the new algorithm, but there were lots of changes between
when I started working on merge-ort and when it was finally ready to
submit for review. I must have just overlooked that this parameter
was no longer needed. Thanks for catching and cleaning up.
> 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).
Yep, makes sense.
> Signed-off-by: Jeff King <peff@xxxxxxxx>
> ---
> merge-ort.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/merge-ort.c b/merge-ort.c
> index 20eefd9b5e..3953c9f745 100644
> --- a/merge-ort.c
> +++ b/merge-ort.c
> @@ -4880,8 +4880,7 @@ static void merge_start(struct merge_options *opt, struct merge_result *result)
> trace2_region_leave("merge", "allocate/init", opt->repo);
> }
>
> -static void merge_check_renames_reusable(struct merge_options *opt,
> - struct merge_result *result,
> +static void merge_check_renames_reusable(struct merge_result *result,
> struct tree *merge_base,
> struct tree *side1,
> struct tree *side2)
> @@ -5083,7 +5082,7 @@ void merge_incore_nonrecursive(struct merge_options *opt,
>
> trace2_region_enter("merge", "merge_start", opt->repo);
> assert(opt->ancestor != NULL);
> - merge_check_renames_reusable(opt, result, merge_base, side1, side2);
> + merge_check_renames_reusable(result, merge_base, side1, side2);
> merge_start(opt, result);
> /*
> * Record the trees used in this merge, so if there's a next merge in
> --
> 2.42.0.628.g8a27295885
