sequencer: remove duplicate rollback_lock_file() call

[newren]

cc: Taylor Blau me@ttaylorr.com
cc: Johannes Schindelin Johannes.Schindelin@gmx.de

[newren]

/submit

[gitgitgadget-git]

Submitted as pull.894.git.git.1603286675709.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git pr-git-894/newren/remove-duplicate-sequencer-code-v1

To fetch this version to local tag pr-git-894/newren/remove-duplicate-sequencer-code-v1:

git fetch --no-tags https://github.com/gitgitgadget/git tag pr-git-894/newren/remove-duplicate-sequencer-code-v1

[gitgitgadget-git]

On the Git mailing list, Taylor Blau wrote (reply to this):

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

[gitgitgadget-git]

User Taylor Blau <me@ttaylorr.com> has been added to the cc: list.

[gitgitgadget-git]

On the Git mailing list, Junio C Hamano wrote (reply to this):

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.

[gitgitgadget-git]

This branch is now known as en/sequencer-rollback-lock-cleanup.

[gitgitgadget-git]

This patch series was integrated into seen via 0f4ff23.

[gitgitgadget-git]

This patch series was integrated into seen via 819389b.

[gitgitgadget-git]

On the Git mailing list, Johannes Schindelin wrote (reply to this):

Hi Elijah,

On Wed, 21 Oct 2020, Elijah Newren via GitGitGadget wrote:

> From: Elijah Newren <newren@gmail.com>
>
> Commit 2b6ad0f4bc ("rebase --rebase-merges: add support for octopus
> merges", 2017-12-21) introduced a case where rollback_lock_file() was
> unconditionally called twice in a row with no intervening commands.
> Remove the duplicate.

Thank you for cleaning up after me. I _know_ that this slipped in a couple
times during my rebasing, and still, this last time it slipped through.

ACK,
Dscho

[gitgitgadget-git]

User Johannes Schindelin <Johannes.Schindelin@gmx.de> has been added to the cc: list.

[gitgitgadget-git]

This patch series was integrated into seen via 87e3850.

[gitgitgadget-git]

This patch series was integrated into seen via 2a2361b.

[gitgitgadget-git]

This patch series was integrated into seen via 23c7542.

[gitgitgadget-git]

This patch series was integrated into seen via cbfb8d2.

[gitgitgadget-git]

This patch series was integrated into seen via 00b6e79.

[gitgitgadget-git]

This patch series was integrated into seen via e02e112.

[gitgitgadget-git]

This patch series was integrated into seen via 38fc02d.

[gitgitgadget-git]

This patch series was integrated into next via 1234e82.

[gitgitgadget-git]

This patch series was integrated into seen via 5e88abb.

[gitgitgadget-git]

This patch series was integrated into seen via f121132.

[gitgitgadget-git]

This patch series was integrated into seen via f8120f9.

[gitgitgadget-git]

This patch series was integrated into seen via 7f8aac1.

[gitgitgadget-git]

This patch series was integrated into seen via dfe7557.

[gitgitgadget-git]

This patch series was integrated into seen via f3e63ab.

[gitgitgadget-git]

This patch series was integrated into next via f3e63ab.

[gitgitgadget-git]

This patch series was integrated into master via f3e63ab.

[gitgitgadget-git]

Closed via f3e63ab.