From: Junio C Hamano Date: Thu, 28 Jul 2016 17:34:42 +0000 (-0700) Subject: Merge branch 'nd/pack-ofs-4gb-limit' X-Git-Tag: v2.10.0-rc0~77 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ad2d77760434e1650c186c71fa04a8fdbd77266c 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 --- ad2d77760434e1650c186c71fa04a8fdbd77266c