diff options
author | Jeff King <peff@peff.net> | 2019-03-15 02:22:44 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-03-18 14:10:11 +0900 |
commit | 90ca14956033e8b13bab59de622b44b6cc47af99 (patch) | |
tree | 507f3e46dbaa0e09b8aab16a43bd151ac28df8e4 /t | |
parent | repack: enable bitmaps by default on bare repos (diff) | |
download | tgif-90ca14956033e8b13bab59de622b44b6cc47af99.tar.xz |
t5310: correctly remove bitmaps for jgit test
We use "jgit gc" to generate a pack bitmap file, and then make sure our
implementation can read it. To prepare the repo before running jgit, we
try to "rm -f" any existing bitmap files. But we got the path wrong;
we're in a bare repo, so looking in ".git/" finds nothing. Our "rm"
doesn't complain because of the "-f", and when we run "rev-list" there
are two bitmap files (ours and jgit's).
Our reader implementation will ignore one of the bitmap files, but it's
likely non-deterministic which one we will use. We'd prefer the one with
the more recent timestamp (just because of the way the packed_git list
is sorted), but in most test runs they'd have identical timestamps.
So this was probably actually testing something useful about 50% of the
time, and other half just testing that we could read our own bitmaps
(which is covered elsewhere).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-x | t/t5310-pack-bitmaps.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh index 82d7f7f6a5..44a038881a 100755 --- a/t/t5310-pack-bitmaps.sh +++ b/t/t5310-pack-bitmaps.sh @@ -269,7 +269,7 @@ test_expect_success JGIT 'we can read jgit bitmaps' ' git clone --bare . compat-jgit.git && ( cd compat-jgit.git && - rm -f .git/objects/pack/*.bitmap && + rm -f objects/pack/*.bitmap && jgit gc && git rev-list --test-bitmap HEAD ) |