Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:13:11 +0000 (14:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:13:11 +0000 (14:13 -0700)
commitc3e034f0f0753126494285d1098e1084ec05d2c4
tree9dc1354338380723e493c472242e8ad6ac25911f
parent3830759c1c91726a97adb2e97e2de08aec60f25a
parent680ee550d72150f27cdb3235462eee355a20038b
Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run'

"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