Jeff King <peff@xxxxxxxx> writes: > On Thu, Jul 14, 2016 at 05:47:41PM +0200, Johannes Schindelin wrote: > >> On Thu, 30 Jun 2016, Jeff King wrote: >> >> > The ustar format only has room for 11 (or 12, depending on >> > some implementations) octal digits for the size and mtime of >> > each file. For values larger than this, we have to add pax >> > extended headers to specify the real data, and git does not >> > yet know how to do so. >> > >> > [...] >> > t/t5000/19f9c8273ec45a8938e6999cb59b3ff66739902a | Bin 0 -> 2048 bytes >> >> It appears that this blob cannot be read when sizeof(unsigned long) == 4. >> This happens to break the t5000 test on Windows, where that comparison >> holds true. >> >> I am sure that I missed some other discussion about this issue... could >> you point me to it? > > There's tons of discussion in: > > http://thread.gmane.org/gmane.comp.version-control.git/297409 > > but frankly it is not worth your time to read it. These tests are about > overflowing the tar limits, which can only happen with times and sizes > greater than 32-bits. The right thing to do is to skip the tests > entirely on systems where sizeof(unsigned long) is less than 8 (the > actual value is 64GB+1, so technically a 37-bit system would work, but I > think it is OK for the test-skipping to be less specific). OK, how about this on top of a replacement for js/t0006-for-v2.9.2 that I'll send out as a reply to this message? archive-tar.c | 5 +++++ t/t5000-tar-tree.sh | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/archive-tar.c b/archive-tar.c index 7ea4e90..4d2832c 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -25,8 +25,13 @@ static int write_tar_filter_archive(const struct archiver *ar, * * Likewise for the mtime (which happens to use a buffer of the same size). */ +#if ULONG_MAX == 0x7FFFFFFF +#define USTAR_MAX_SIZE ULONG_MAX +#define USTAR_MAX_MTIME ULONG_MAX +#else #define USTAR_MAX_SIZE 077777777777UL #define USTAR_MAX_MTIME 077777777777UL +#endif /* writes out the whole block, but only if it is full */ static void write_if_needed(void) diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 96d208d..9c97789 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -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 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,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 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 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,64BIT 'system tar can read our future mtime' ' echo 4147 >expect && tar_info future.tar | cut -d" " -f2 >actual && test_cmp expect actual -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html