Re: [PATCH 1/2] Change default merge backend from recursive to ort

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Aug 2, 2021, 15:55 UTC
Message-ID: <87h7g7on6q.fsf@evledraar.gmail.com>
In-Reply-To: <8f6af8d494e0924aef4ae6963b8dca2228dad9b1.1627776462.git.gitgitgadget@gmail.com>

On Sun, Aug 01 2021, Elijah Newren via GitGitGadget wrote:

Show 11 quoted lines

> From: Elijah Newren <newren@gmail.com>
> [...]
> @@ -3968,7 +3968,7 @@ static int do_merge(struct repository *r,
>  	o.branch2 = ref_name.buf;
>  	o.buffer_output = 2;
>  
> -	if (opts->strategy && !strcmp(opts->strategy, "ort")) {
> +	if (!opts->strategy || strcmp(opts->strategy, "recursive")) {
>  		/*
>  		 * TODO: Should use merge_incore_recursive() and
>  		 * merge_switch_to_result(), skipping the call to

I might spot more tiny issues, but it looks like our error messaging needs updating for 14c4586c2df (merge,rebase,revert: select ort or recursive by config or environment, 2020-11-02).

I.e. we die on "Unknown option for merge-recursive", presumably that should be updated to indicate that we might call one of merge_recursive() or merge_ort_recursive() now.

And perhaps this in sequencer.c:

    that represents the "current" state for merge-recursive[...]