From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Oct 2020 19:55:05 GMT
Subject: Re: [PATCH] sequencer: remove duplicate rollback_lock_file() call
Message-ID: <xmqqmu0f73s6.fsf@gitster.c.googlers.com>
In-Reply-To: <20201021171727.GA1237181@nand.local>

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.