Merge branch 'jk/am-rerere-lock-fix'
commit7662973ea38e39f2766a4403209189f263c914a3
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Sep 2015 21:14:01 +0000 (3 14:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Sep 2015 21:14:01 +0000 (3 14:14 -0700)
tree38d64a67067ae465a32e50e3b998c7d84c29c2fc
parent16ffa6443e279a9b3b63d7a2bebeb07833506010
parent9dd330e6cad6ce11557acb18f35136c549d8ac1b
Merge branch 'jk/am-rerere-lock-fix'

Recent "git am" introduced a double-locking failure when used with
the "--3way" option that invokes rerere machinery.

* jk/am-rerere-lock-fix:
  rerere: release lockfile in non-writing functions