diff options
| author |  Martin Ågren <martin.agren@gmail.com> | 2018-02-28 20:07:57 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-02-28 11:15:51 -0800 |
| commit | 5790d25881a60a1c3a780e997a59774e48c2c026 (patch) | |
| tree | 012c51b4d3eb8fef81294f69d363151181c82b53 /t | |
| parent | merge-recursive: always roll back lock in `merge_recursive_generic()` (diff) | |
| download | tgif-5790d25881a60a1c3a780e997a59774e48c2c026.tar.xz | |
merge: always roll back lock in `checkout_fast_forward()`
This function originated in builtin/merge.c. It was moved to merge.c in
commit db699a8a1f (Move try_merge_command and checkout_fast_forward to
libgit.a, 2012-10-26), but was used from sequencer.c even before that.
If a problem occurs, the function returns without rolling back the
lockfile. Teach it to do so.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions