Merge branch 'nd/pack-ofs-4gb-limit' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:21:36 +0000 (14:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:21:36 +0000 (14:21 -0700)
"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

1  2 
builtin/cat-file.c
builtin/fsck.c
builtin/pack-objects.c
cache.h
sha1_file.c

Simple merge
diff --cc builtin/fsck.c
Simple merge
Simple merge
diff --cc cache.h
Simple merge
diff --cc sha1_file.c
Simple merge