]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6481652) | patch
merge-recursive: always roll back lock in `merge_recursive_generic()`
authorMartin Ågren <martin.agren@gmail.com>
Wed, 28 Feb 2018 19:07:56 +0000 (20:07 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2018 19:15:51 +0000 (11:15 -0800)
commit51d3f43d2fd7f93cd19494eef4aef712fad597c2
tree915f5c117a9654ccc5b6dfabe47b036cacab910dtree | snapshot
parent6481652432eed5b073428411763d5b5d712b6745commit | diff
merge-recursive: always roll back lock in `merge_recursive_generic()`

If we return early, or if `active_cache_changed` is false, we forget to
roll back the lockfile.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.