Re: [PATCH] merge-ort: fix calling merge_finalize() with no intermediate merge
Derrick Stolee <derrickstolee@github.com> writes:
Show 8 quoted lines
> 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.
Show 9 quoted lines
> 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.
Junio C Hamano <gitster@pobox.com>