diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:37 -0700 |
| commit | 1725c4c64b462af36a9b7e83869af2806ea9d258 (patch) | |
| tree | ddbbaf8ff66ed610fcc9b6a6068569e2031d34fd /t/t6200-fmt-merge-msg.sh | |
| parent | Merge branch 'en/pull-conflicting-options' into maint (diff) | |
| parent | apply: keep buffer/size pair in sync when parsing binary hunks (diff) | |
| download | tgif-1725c4c64b462af36a9b7e83869af2806ea9d258.tar.xz | |
Merge branch 'jk/apply-binary-hunk-parsing-fix' into maint
"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
Diffstat (limited to 't/t6200-fmt-merge-msg.sh')
0 files changed, 0 insertions, 0 deletions