* [PATCH] sequencer: remove duplicate rollback_lock_file() call
@ 2020-10-21 13:24 Elijah Newren via GitGitGadget
2020-10-21 17:17 ` Taylor Blau
2020-10-22 9:12 ` Johannes Schindelin
0 siblings, 2 replies; 4+ messages in thread
From: Elijah Newren via GitGitGadget @ 2020-10-21 13:24 UTC (permalink / raw)
To: git; +Cc: Elijah Newren, Elijah Newren
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.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
sequencer: remove duplicate rollback_lock_file() call
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-894%2Fnewren%2Fremove-duplicate-sequencer-code-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-894/newren/remove-duplicate-sequencer-code-v1
Pull-Request: https://github.com/git/git/pull/894
sequencer.c | 1 -
1 file changed, 1 deletion(-)
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);
ret = run_command(&cmd);
/* force re-reading of the cache */
base-commit: 69986e19ffcfb9af674ae5180689ab7bbf92ed28
--
gitgitgadget
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] sequencer: remove duplicate rollback_lock_file() call
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
2020-10-22 9:12 ` Johannes Schindelin
1 sibling, 1 reply; 4+ messages in thread
From: Taylor Blau @ 2020-10-21 17:17 UTC (permalink / raw)
To: Elijah Newren via GitGitGadget; +Cc: git, Elijah Newren
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] sequencer: remove duplicate rollback_lock_file() call
2020-10-21 17:17 ` Taylor Blau
@ 2020-10-21 19:55 ` Junio C Hamano
0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2020-10-21 19:55 UTC (permalink / raw)
To: Taylor Blau; +Cc: Elijah Newren via GitGitGadget, git, Elijah Newren
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] sequencer: remove duplicate rollback_lock_file() call
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-22 9:12 ` Johannes Schindelin
1 sibling, 0 replies; 4+ messages in thread
From: Johannes Schindelin @ 2020-10-22 9:12 UTC (permalink / raw)
To: Elijah Newren via GitGitGadget; +Cc: git, Elijah Newren, Elijah Newren
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-22 9:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2020-10-22 9:12 ` Johannes Schindelin
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).