Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run' into next
authorJunio C Hamano <gitster@pobox.com>
Sun, 20 Aug 2017 06:07:19 +0000 (23:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 Aug 2017 06:07:19 +0000 (23:07 -0700)
commit2b5a25e5ae0b8e6a0d2b1bd5b8e73da2bd3259db
tree414f029dfad6b712cffc077db995ae4949eb5dd1
parent6ae3831c8c1df5e569e826b087ff5be18829124b
parent680ee550d72150f27cdb3235462eee355a20038b
Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run' into next

"git commit" used to discard the index and re-read from the filesystem
just in case the pre-commit hook has updated it in the middle; this
has been optimized out when we know we do not run the pre-commit hook.

* kw/commit-keep-index-when-pre-commit-is-not-run:
  commit: skip discarding the index if there is no pre-commit hook
builtin/commit.c