git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] sequencer: remove duplicate rollback_lock_file() call

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 21, 2020, 19:55 UTC
Message-ID
<xmqqmu0f73s6.fsf@gitster.c.googlers.com>
In-Reply-To
<20201021171727.GA1237181@nand.local>
Taylor Blau <me@ttaylorr.com> writes:
Show 19 quoted lines
> 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.
Previous: Taylor BlauNext: Johannes Schindelin
Message 3 of 4 in “sequencer: remove duplicate rollback_lock_file() call”
  1. sequencer: remove duplicate rollback_lock_file() callElijah Newren via GitGitGadget, Oct 21, 2020
  2. Taylor BlauOct 21, 2020
  3. Junio C HamanoOct 21, 2020
  4. Johannes SchindelinOct 22, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.