From: Stefan Beller <sbeller@google.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git <git@vger.kernel.org>
Subject: Re: [PATCH 2/3] sequencer.c: free author variable when merging fails
Date: Thu, 31 May 2018 11:52:52 -0700 [thread overview]
Message-ID: <CAGZ79kbhYSuBEEgALAmFT6Cf4+wmqFO_cMScBDs8CcgFwckXQg@mail.gmail.com> (raw)
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:
> 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.
>> - 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
next prev parent reply other threads:[~2018-05-31 18:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-30 17:03 [PATCH 1/3] refs/packed-backend.c: close fd of empty file Stefan Beller
2018-05-30 17:03 ` [PATCH 2/3] sequencer.c: free author variable when merging fails Stefan Beller
2018-05-31 12:04 ` Johannes Schindelin
2018-05-31 18:52 ` Stefan Beller [this message]
2018-05-30 17:03 ` [PATCH 3/3] submodule--helper: plug mem leak in print_default_remote Stefan Beller
2018-05-31 12:07 ` Johannes Schindelin
2018-05-31 18:55 ` Stefan Beller
2018-06-01 8:46 ` Johannes Schindelin
2018-05-31 5:15 ` [PATCH 1/3] refs/packed-backend.c: close fd of empty file Jeff King
2018-05-31 11:49 ` Michael Haggerty
2018-05-31 12:06 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAGZ79kbhYSuBEEgALAmFT6Cf4+wmqFO_cMScBDs8CcgFwckXQg@mail.gmail.com \
--to=sbeller@google.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).