From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 Apr 2023 17:10:21 GMT
Subject: Re: [PATCH] merge-ort: fix calling merge_finalize() with no intermediate merge
Message-ID: <xmqqa5z21nuq.fsf@gitster.g>
In-Reply-To: <d5c93b5b-32b9-ec50-1661-06f73fa37f5f@github.com>

Derrick Stolee <derrickstolee@github.com> writes:

> On 4/20/2023 3:14 AM, Elijah Newren via GitGitGadget wrote:
>> From: Elijah Newren <newren@gmail.com>
>
>> While at it, ensure the FREE_AND_NULL() in the function does something
>> useful with the nulling aspect, namely sets result->priv to NULL rather
>> than a mere temporary.
>
> Good call. It also makes the code look better.

And more correct, if the NULLness of result->priv matters.

> Perhaps this would be better as
>
> 	if (result->priv) {
> 		clear_or_reinit_internal_opts(result->priv, 0);
> 		FREE_AND_NULL(result->priv);
> 	}
>
> to avoid an accidental addition of code to the end of this
> method that doesn't depend on result->priv?

It does sound like a good idea.

Thanks.