summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-09-25 15:24:09 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-25 15:24:09 +0900
commitf759c873a3772675dba050f28c33d585406291c3 (patch)
treee9582f9d3ec63ca76c4687d5e761a530344a7f92 /xdiff
parentMerge branch 'mh/for-each-string-list-item-empty-fix' (diff)
parentread_info_alternates: warn on non-trivial errors (diff)
downloadtgif-f759c873a3772675dba050f28c33d585406291c3.tar.xz
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
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions