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

From: "Elijah Newren via GitGitGadget" <[email-masked]>
Date: Wed, 21 Oct 2020 13:24:35 +0000

From: Elijah Newren <[email-masked]>

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 <[email-masked]>
---
    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