Skip to content

Commit 9a82db1

Browse files
newrengitster
authored andcommitted
sequencer: remove duplicate rollback_lock_file() call
Commit 2b6ad0f ("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 protected]> Reviewed-by: Taylor Blau <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b3d7a52 commit 9a82db1

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

sequencer.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3572,7 +3572,6 @@ static int do_merge(struct repository *r,
35723572
unlink(git_path_cherry_pick_head(r));
35733573
rollback_lock_file(&lock);
35743574

3575-
rollback_lock_file(&lock);
35763575
ret = run_command(&cmd);
35773576

35783577
/* force re-reading of the cache */

0 commit comments

Comments
 (0)