From: Junio C Hamano <gitster@pobox.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH] sequencer: remove duplicate rollback_lock_file() call
Date: Wed, 21 Oct 2020 12:55:05 -0700 [thread overview]
Message-ID: <xmqqmu0f73s6.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20201021171727.GA1237181@nand.local> (Taylor Blau's message of "Wed, 21 Oct 2020 13:17:27 -0400")
Taylor Blau <me@ttaylorr.com> writes:
> Hi Elijah,
>
> On Wed, Oct 21, 2020 at 01:24:35PM +0000, Elijah Newren via GitGitGadget wrote:
>> diff --git a/sequencer.c b/sequencer.c
>> index 00acb12496..baff51035e 100644
>> --- a/sequencer.c
>> +++ b/sequencer.c
>> @@ -3689,7 +3689,6 @@ static int do_merge(struct repository *r,
>> NULL, 0);
>> rollback_lock_file(&lock);
>>
>> - rollback_lock_file(&lock);
>
> Looks obviously good to me, thanks.
>
> Reviewed-by: Taylor Blau <me@ttaylorr.com>
>
> Thanks,
> Taylor
Thanks, both. That's an embarrassing one.
next prev parent reply other threads:[~2020-10-21 19:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 13:24 [PATCH] sequencer: remove duplicate rollback_lock_file() call Elijah Newren via GitGitGadget
2020-10-21 17:17 ` Taylor Blau
2020-10-21 19:55 ` Junio C Hamano [this message]
2020-10-22 9:12 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqmu0f73s6.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=me@ttaylorr.com \
--cc=newren@gmail.com \
/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.
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 NNTP newsgroup(s).