sequencer: remove duplicate rollback_lock_file() call

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>
Reviewed-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sequencer.c b/sequencer.c
index fd7701c88a8643c424d4f61fd0cc86fde3097d7d..935860a5c43e37a0e9ee99ceb9f5ea074ff8d5db 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -3572,7 +3572,6 @@ static int do_merge(struct repository *r,
                unlink(git_path_cherry_pick_head(r));
                rollback_lock_file(&lock);
 
-               rollback_lock_file(&lock);
                ret = run_command(&cmd);
 
                /* force re-reading of the cache */