Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jun 2017 00:32:04 +0000 (09:32 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jun 2017 00:32:04 +0000 (09:32 +0900)
* maint:
sha1dc: update from upstream
sha1dc: ignore indent-with-non-tab whitespace violations

Trivial merge