git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 14bca6c)
sequencer: always roll back lock in `do_recursive_merge()`
authorMartin Ågren <redacted>
Tue, 27 Feb 2018 21:30:10 +0000 (22:30 +0100)
committerJunio C Hamano <redacted>
Tue, 27 Feb 2018 22:48:17 +0000 (14:48 -0800)
commit6481652432eed5b073428411763d5b5d712b6745
treed993ff549a34af52bc2baa3c2ac187bf134d147atree | snapshot
parent14bca6c63cec3bd6e9b636fd1ff5b0ea2bd5edcecommit | diff
sequencer: always roll back lock in `do_recursive_merge()`

If we return early, we forget to roll back the lockfile. Do so.

Signed-off-by: Martin Ågren <redacted>
Signed-off-by: Junio C Hamano <redacted>
sequencer.c diff | blob | history
git clone https://git.99rst.org/PROJECT