tree a96c9614746a471683afc0cd26653daabe8e44a6
parent 9fc7bc656858ef1b2d8f18856af59e23cda489d8
parent f0f7bebef73346a12aa1e22cf5264cbc241ab069
author Junio C Hamano <gitster@pobox.com> 1508737200 +0900
committer Junio C Hamano <gitster@pobox.com> 1508737200 +0900

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