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>
Elijah Newren committed
Oct 21, 2020 at 13:24 UTC
9a82db105677e823f23d11cd8f4c0d9f8a3b44f2
1 file changed
-1
sequencer.c
-1
@@ -3572,7 +3572,6 @@ static int do_merge(struct repository *r,
3572
unlink(git_path_cherry_pick_head(r));
3573
rollback_lock_file(&lock);
3574
3575
- rollback_lock_file(&lock);
3575
ret = run_command(&cmd);
3576
3577
/* force re-reading of the cache */