| commit | 8277dc939053d320ff1e0eb21c767de38b0c2f40 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Jul 2014 19:36:17 +0000 (21 12:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Jul 2014 19:36:17 +0000 (21 12:36 -0700) | ||
| tree | 78cf4114dabdcbf4eb6d5d9c25e7af7a7b9626fe | treesnapshot (tar.gz zip) |
| parent | 63e8891e97c9fe5917e95e565e8bebcf7b2221f1 | commitdiff |
| parent | 93dcaea22674864f931be3fe6050671d335dc5b0 | commitdiff |
Merge branch 'jc/reopen-lock-file' into next
Needed in the "commit -p" code path to update the cache tree in the
index.
* jc/reopen-lock-file:
lockfile: allow reopening a closed but still locked file
Needed in the "commit -p" code path to update the cache tree in the
index.
* jc/reopen-lock-file:
lockfile: allow reopening a closed but still locked file
| cache.h | diff1 | diff2 | blobhistory |
| lockfile.c | diff1 | diff2 | blobhistory |