| commit | 6481652432eed5b073428411763d5b5d712b6745 | |
| author | Martin Ågren <martin.agren@gmail.com> | |
| Tue, 27 Feb 2018 21:30:10 +0000 (27 22:30 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Feb 2018 22:48:17 +0000 (27 14:48 -0800) | ||
| tree | d993ff549a34af52bc2baa3c2ac187bf134d147a | treesnapshot (tar.gz zip) |
| parent | 14bca6c63cec3bd6e9b636fd1ff5b0ea2bd5edce | commitdiff |
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 <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If we return early, we forget to roll back the lockfile. Do so.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| sequencer.c | diffblobblamehistory |