diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-10-03 13:30:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-03 13:30:36 -0700 |
| commit | 71a57ab32d211be19729c3afaf0a7c7283c7a4e2 (patch) | |
| tree | 0e251211fd9fd99e0f7ab724084791db632608b7 /mergetools/gvimdiff2 | |
| parent | Merge branch 'nd/init-core-worktree-in-multi-worktree-world' (diff) | |
| parent | unpack_sha1_header(): detect malformed object header (diff) | |
| download | tgif-71a57ab32d211be19729c3afaf0a7c7283c7a4e2.tar.xz | |
Merge branch 'jc/verify-loose-object-header'
Codepaths that read from an on-disk loose object were too loose in
validating what they are reading is a proper object file and
sometimes read past the data they read from the disk, which has
been corrected. H/t to Gustavo Grieco for reporting.
* jc/verify-loose-object-header:
unpack_sha1_header(): detect malformed object header
streaming: make sure to notice corrupt object
Diffstat (limited to 'mergetools/gvimdiff2')
0 files changed, 0 insertions, 0 deletions