diff options
| author | Martin Ågren <martin.agren@gmail.com> | 2018-02-27 22:30:10 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 14:48:17 -0800 |
| commit | 6481652432eed5b073428411763d5b5d712b6745 (patch) | |
| tree | d993ff549a34af52bc2baa3c2ac187bf134d147a /builtin/commit.c | |
| parent | 14bca6c63cec3bd6e9b636fd1ff5b0ea2bd5edce (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 <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions