diff options
| author | Elijah Newren <newren@gmail.com> | 2020-10-21 16:24:35 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-21 22:54:44 +0300 |
| commit | 9a82db105677e823f23d11cd8f4c0d9f8a3b44f2 (patch) | |
| tree | 4ec5fe9807b0931cba9f9596db3bb09887a340e7 /sequencer.c | |
| parent | b3d7a52fac39193503a0b6728771d1bf6a161464 (diff) | |
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>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 1 |
1 files changed, 0 insertions, 1 deletions
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 */ |