Re: [PATCH 2/3] sequencer.c: free author variable when merging fails

From: Stefan Beller <sbeller@google.com>
Date: May 31, 2018, 18:52 UTC
Message-ID: <CAGZ79kbhYSuBEEgALAmFT6Cf4+wmqFO_cMScBDs8CcgFwckXQg@mail.gmail.com>
In-Reply-To: <nycvar.QRO.7.76.6.1805311402210.82@tvgsbejvaqbjf.bet>

On Thu, May 31, 2018 at 5:04 AM, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 11 quoted lines

> Hi Stefan,
>
> On Wed, 30 May 2018, Stefan Beller wrote:
>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>>
>> This was a deliberate oversight in f241ff0d0a9 (prepare the builtins for a
>> libified merge_recursive(), 2016-07-26)
>
> No, it was not deliberate. It was inadvertent, most likely ;-)

ok, I am not just bad at writing commit messages, but also bad at reading other peoples commit messages. ;)

"As this patch is already complex enough, we leave that change for a later patch." is what lead me to believe it was deliberate.

Show 8 quoted lines

>> -             if (res < 0)
>> +             if (res < 0) {
>> +                     free(author);
>>                       return res;
>
> Why not `goto leave;` instead? I wonder what is happening to the commit
> message: can we be certain at this point that it was not set yet? And
> also: should we call `update_abort_safety_file()`?

I think so, but wasn't sure. I wrote these patches before my usual morning routine. I'll change that.

Thanks, Stefan