From: Junio C Hamano Date: Tue, 6 Mar 2018 23:11:47 +0000 (-0800) Subject: Merge branch 'ma/roll-back-lockfiles' into next X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/be29bf891cfda74cce7a0e3312739c77eaf97288?hp=--cc Merge branch 'ma/roll-back-lockfiles' into next Some codepaths used to take a lockfile and did not roll it back; they are automatically rolled back at program exit, so there is no real "breakage", but it still is a good practice to roll back when you are done with a lockfile. * ma/roll-back-lockfiles: sequencer: do not roll back lockfile unnecessarily merge: always roll back lock in `checkout_fast_forward()` merge-recursive: always roll back lock in `merge_recursive_generic()` sequencer: always roll back lock in `do_recursive_merge()` sequencer: make lockfiles non-static --- be29bf891cfda74cce7a0e3312739c77eaf97288