From 9a82db105677e823f23d11cd8f4c0d9f8a3b44f2 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Wed, 21 Oct 2020 13:24:35 +0000 Subject: 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 Reviewed-by: Taylor Blau Signed-off-by: Junio C Hamano --- sequencer.c | 1 - 1 file changed, 1 deletion(-) (limited to 'sequencer.c') diff --git a/sequencer.c b/sequencer.c index fd7701c88a..935860a5c4 100644 --- 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 */ -- cgit v1.2.3