git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b3d7a52)
sequencer: remove duplicate rollback_lock_file() call
authorElijah Newren <redacted>
Wed, 21 Oct 2020 13:24:35 +0000 (13:24 +0000)
committerJunio C Hamano <redacted>
Wed, 21 Oct 2020 19:54:44 +0000 (12:54 -0700)
commit9a82db105677e823f23d11cd8f4c0d9f8a3b44f2
tree4ec5fe9807b0931cba9f9596db3bb09887a340e7tree | snapshot
parentb3d7a52fac39193503a0b6728771d1bf6a161464commit | 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 <redacted>
Reviewed-by: Taylor Blau <redacted>
Signed-off-by: Junio C Hamano <redacted>
sequencer.c diff | blob | history
git clone https://git.99rst.org/PROJECT