diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-10-21 13:24:35 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-10-21 12:54:44 -0700 |
| commit | 9a82db105677e823f23d11cd8f4c0d9f8a3b44f2 (patch) | |
| tree | 4ec5fe9807b0931cba9f9596db3bb09887a340e7 /rebase.c | |
| parent | Git 2.27 (diff) | |
| download | tgif-9a82db105677e823f23d11cd8f4c0d9f8a3b44f2.tar.xz | |
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 'rebase.c')
0 files changed, 0 insertions, 0 deletions