undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sequencer: remove duplicate rollback_lock_file() call

Browse Source 
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>
This commit is contained in:
Elijah Newren 2020-10-21 13:24:35 +00:00 committed by Junio C Hamano
parent b3d7a52fac
commit 9a82db1056
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sequencer.c
View File

@ -3572,7 +3572,6 @@ static int do_merge(struct repository *r,
unlink(git_path_cherry_pick_head(r)); unlink(git_path_cherry_pick_head(r));
rollback_lock_file(&lock); rollback_lock_file(&lock);
rollback_lock_file(&lock);
ret = run_command(&cmd); ret = run_command(&cmd);
/* force re-reading of the cache */ /* force re-reading of the cache */