]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/apply-binary-hunk-parsing-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Aug 2021 23:06:04 +0000 (16:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Aug 2021 23:06:04 +0000 (16:06 -0700)
"git apply" miscounted the bytes and failed to read to the end of
binary hunks.

* jk/apply-binary-hunk-parsing-fix:
  apply: keep buffer/size pair in sync when parsing binary hunks

1  2 
apply.c
t/t4103-apply-binary.sh

diff --cc apply.c
Simple merge
Simple merge