Merge branch 'jk/info-alternates-fix' into maint
commit95c1a7963099ff5fec5e2445c29ba7565bd149b0
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2017 05:40:00 +0000 (23 14:40 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2017 05:40:00 +0000 (23 14:40 +0900)
treea96c9614746a471683afc0cd26653daabe8e44a6
parent9fc7bc656858ef1b2d8f18856af59e23cda489d8
parentf0f7bebef73346a12aa1e22cf5264cbc241ab069
Merge branch 'jk/info-alternates-fix' into maint

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