summaryrefslogtreecommitdiff
path: root/t/t5310-pack-bitmaps.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-03-15 06:22:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-03-18 05:10:11 (GMT)
commit90ca14956033e8b13bab59de622b44b6cc47af99 (patch)
tree507f3e46dbaa0e09b8aab16a43bd151ac28df8e4 /t/t5310-pack-bitmaps.sh
parent36eba0323d3288a8d3dcb46e5067d88c07cee1ae (diff)
downloadgit-90ca14956033e8b13bab59de622b44b6cc47af99.zip
git-90ca14956033e8b13bab59de622b44b6cc47af99.tar.gz
git-90ca14956033e8b13bab59de622b44b6cc47af99.tar.bz2
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/t5310-pack-bitmaps.sh')
-rwxr-xr-xt/t5310-pack-bitmaps.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index 82d7f7f..44a0388 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
)