Merge branch 'jh/fsck-promisors' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:10:58 +0000 (15:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2018 22:10:58 +0000 (15:10 -0700)
A hotfix to a topic that graduated recently.

* jh/fsck-promisors:
sha1_file: restore OBJECT_INFO_QUICK functionality

1  2 
sha1_file.c
diff --cc sha1_file.c
Simple merge