diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-08 23:21:36 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 23:21:36 +0200 |
| commit | aa9136a87e3ce299fe966da4686a571d6a528311 (patch) | |
| tree | 2e9ffe0f8191779bcf30a7d30269eeba80926173 /t | |
| parent | Merge branch 'rs/notes-merge-no-toctou' into maint (diff) | |
| parent | fsck: use streaming interface for large blobs in pack (diff) | |
| download | git-aa9136a87e3ce299fe966da4686a571d6a528311.tar.xz git-aa9136a87e3ce299fe966da4686a571d6a528311.zip | |
Merge branch 'nd/pack-ofs-4gb-limit' into maint
"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 't')
| -rwxr-xr-x | t/t1050-large.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/t/t1050-large.sh b/t/t1050-large.sh index f9f3d1391f..096dbffecc 100755 --- a/t/t1050-large.sh +++ b/t/t1050-large.sh @@ -177,10 +177,9 @@ test_expect_success 'zip achiving, deflate' ' git archive --format=zip HEAD >/dev/null ' -test_expect_success 'fsck' ' - test_must_fail git fsck 2>err && - n=$(grep "error: attempting to allocate .* over limit" err | wc -l) && - test "$n" -gt 1 +test_expect_success 'fsck large blobs' ' + git fsck 2>err && + test_must_be_empty err ' test_done |