diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-28 10:34:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-28 10:34:42 -0700 |
| commit | ad2d77760434e1650c186c71fa04a8fdbd77266c (patch) | |
| tree | e6f51ef4203047bda1d108bed7f3ca35196d8b4c /Documentation/git-merge-index.txt | |
| parent | Merge branch 'nd/worktree-lock' (diff) | |
| parent | fsck: use streaming interface for large blobs in pack (diff) | |
| download | tgif-ad2d77760434e1650c186c71fa04a8fdbd77266c.tar.xz | |
Merge branch 'nd/pack-ofs-4gb-limit'
"git pack-objects" and "git index-pack" mostly operate with off_t
when talking about the offset of objects in a packfile, but there
were a handful of places that used "unsigned long" to hold that
value, leading to an unintended truncation.
* nd/pack-ofs-4gb-limit:
fsck: use streaming interface for large blobs in pack
pack-objects: do not truncate result in-pack object size on 32-bit systems
index-pack: correct "offset" type in unpack_entry_data()
index-pack: report correct bad object offsets even if they are large
index-pack: correct "len" type in unpack_data()
sha1_file.c: use type off_t* for object_info->disk_sizep
pack-objects: pass length to check_pack_crc() without truncation
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions