Merge branch 'jk/info-alternates-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Sep 2017 06:24:09 +0000 (15:24 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Sep 2017 06:24:09 +0000 (15:24 +0900)
commitf759c873a3772675dba050f28c33d585406291c3
treee9582f9d3ec63ca76c4687d5e761a530344a7f92
parent48f1e49be19ab64f9dfdffa32073dd1dbbf04727
parentf0f7bebef73346a12aa1e22cf5264cbc241ab069
Merge branch 'jk/info-alternates-fix'

A regression fix for 2.11 that made the code to read the list of
alternate object stores overrun the end of the string.

* jk/info-alternates-fix:
  read_info_alternates: warn on non-trivial errors
  read_info_alternates: read contents into strbuf
sha1_file.c