Merge branch 'jk/info-alternates-fix-2.11' into jk/info-alternates-fix
commit0db625f5d69c9d1fb6ace137fc755887aef3049e
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Sep 2017 02:33:06 +0000 (20 11:33 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Sep 2017 02:33:06 +0000 (20 11:33 +0900)
tree3699cdbe16ca7635b40c97fdd91860ad41b15f09
parent94c9fd268d4287f6fbfef84793288479905a7e48
parentdc732bd5cb53c7f01a2bd3e4501320145e4b9498
Merge branch 'jk/info-alternates-fix-2.11' into jk/info-alternates-fix

* jk/info-alternates-fix-2.11:
  read_info_alternates: read contents into strbuf
sha1_file.c