Merge branch 'en/sequencer-rollback-lock-cleanup'

Code clean-up. * en/sequencer-rollback-lock-cleanup: sequencer: remove duplicate rollback_lock_file() call
git · Nov 2, 2020 · f3e63ab · f3e63ab
2 parents 1ae0949 + 9a82db1
commit f3e63ab
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/sequencer.c b/sequencer.c
@@ -3691,7 +3691,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 */