diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-14 13:04:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-15 10:51:55 -0700 |
| commit | 29493589e97a2de0c4c1c314f61ccafaee3b5caf (patch) | |
| tree | ad4bc08358d295ecc87492b3ff9c231f909c3027 /t | |
| parent | 82246e075e5c028dd886adda68e28de092e33df1 (diff) | |
| download | git-29493589e97a2de0c4c1c314f61ccafaee3b5caf.tar.gz git-29493589e97a2de0c4c1c314f61ccafaee3b5caf.tar.xz | |
archive-tar: huge offset and future timestamps would not work on 32-bit
As we are not yet moving everything to size_t but still using ulong
internally when talking about the size of object, platforms with
32-bit long will not be able to produce tar archive with 4GB+ file,
and cannot grok 077777777777UL as a constant. Disable the extended
header feature and do not test it on them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5000-tar-tree.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 96d208da2..80b238734 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -347,7 +347,7 @@ test_lazy_prereq TAR_HUGE ' test_cmp expect actual ' -test_expect_success 'set up repository with huge blob' ' +test_expect_success LONG_IS_64BIT 'set up repository with huge blob' ' obj_d=19 && obj_f=f9c8273ec45a8938e6999cb59b3ff66739902a && obj=${obj_d}${obj_f} && @@ -360,7 +360,7 @@ test_expect_success 'set up repository with huge blob' ' # We expect git to die with SIGPIPE here (otherwise we # would generate the whole 64GB). -test_expect_success 'generate tar with huge size' ' +test_expect_success LONG_IS_64BIT 'generate tar with huge size' ' { git archive HEAD echo $? >exit-code @@ -369,13 +369,13 @@ test_expect_success 'generate tar with huge size' ' test_cmp expect exit-code ' -test_expect_success TAR_HUGE 'system tar can read our huge size' ' +test_expect_success TAR_HUGE,LONG_IS_64BIT 'system tar can read our huge size' ' echo 68719476737 >expect && tar_info huge.tar | cut -d" " -f1 >actual && test_cmp expect actual ' -test_expect_success 'set up repository with far-future commit' ' +test_expect_success LONG_IS_64BIT 'set up repository with far-future commit' ' rm -f .git/index && echo content >file && git add file && @@ -383,11 +383,11 @@ test_expect_success 'set up repository with far-future commit' ' git commit -m "tempori parendum" ' -test_expect_success 'generate tar with future mtime' ' +test_expect_success LONG_IS_64BIT 'generate tar with future mtime' ' git archive HEAD >future.tar ' -test_expect_success TAR_HUGE 'system tar can read our future mtime' ' +test_expect_success TAR_HUGE,LONG_IS_64BIT 'system tar can read our future mtime' ' echo 4147 >expect && tar_info future.tar | cut -d" " -f2 >actual && test_cmp expect actual |