Merge branch 'jc/reopen-lock-file' into jch
commit74785f1ff32b47f84a7ab8e99a9d7d802c54f491
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:12:02 +0000 (21 11:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:12:02 +0000 (21 11:12 -0700)
treefd079ada187ac71bd6a725abf928e14f24d7e657
parent04a1c97f20a1b0d98a88befaeca8086a4e91f911
parent93dcaea22674864f931be3fe6050671d335dc5b0
Merge branch 'jc/reopen-lock-file' into jch

Needed in the "commit -p" code path to update the cache tree in the
index (e.g. for dt/cache-tree-repair topic).

* jc/reopen-lock-file:
  lockfile: allow reopening a closed but still locked file
cache.h
lockfile.c