summaryrefslogtreecommitdiff
path: root/mergesort.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-10-23 14:40:00 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-23 14:40:00 +0900
commit95c1a7963099ff5fec5e2445c29ba7565bd149b0 (patch)
treea96c9614746a471683afc0cd26653daabe8e44a6 /mergesort.h
parentMerge branch 'jc/fetch-refspec-doc-update' into maint (diff)
parentread_info_alternates: warn on non-trivial errors (diff)
downloadtgif-95c1a7963099ff5fec5e2445c29ba7565bd149b0.tar.xz
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
Diffstat (limited to 'mergesort.h')
0 files changed, 0 insertions, 0 deletions