From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 Jan 2022 23:19:43 GMT
Subject: Re: [PATCH] merge-ort: avoid assuming all renames detected
Message-ID: <xmqqwnizxo8g.fsf@gitster.g>
In-Reply-To: <pull.1194.git.git.1642212566346.gitgitgadget@gmail.com>

"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:

> diff --git a/merge-ort.c b/merge-ort.c
> index c3197970219..143d274f117 100644
> --- a/merge-ort.c
> +++ b/merge-ort.c
> @@ -3060,6 +3060,10 @@ static int detect_and_process_renames(struct merge_options *opt,
>  	trace2_region_enter("merge", "regular renames", opt->repo);
>  	detection_run |= detect_regular_renames(opt, MERGE_SIDE1);
>  	detection_run |= detect_regular_renames(opt, MERGE_SIDE2);
> +	if (renames->needed_limit != 0) {

Don't compare with NULL or 0, i.e.

	if (renames->needed_limit) {

> +		renames->cached_pairs_valid_side = 0;
> +		renames->redo_after_renames = 0;
> +	}
>  	if (renames->redo_after_renames && detection_run) {
>  		int i, side;
>  		struct diff_filepair *p;