]> git.ipfire.org Git - thirdparty/git.git/commit - merge.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 51d3f43) | patch
merge: always roll back lock in `checkout_fast_forward()`
authorMartin Ågren <martin.agren@gmail.com>
Wed, 28 Feb 2018 19:07:57 +0000 (20:07 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2018 19:15:51 +0000 (11:15 -0800)
commit5790d25881a60a1c3a780e997a59774e48c2c026
tree012c51b4d3eb8fef81294f69d363151181c82b53tree | snapshot
parent51d3f43d2fd7f93cd19494eef4aef712fad597c2commit | diff
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>
merge.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.