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)
"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

1  2 
builtin/commit.c
Simple merge