]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/info-alternates-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2017 05:40:00 +0000 (14:40 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2017 05:40:00 +0000 (14:40 +0900)
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

1  2 
sha1_file.c

diff --cc sha1_file.c
Simple merge