summaryrefslogtreecommitdiff
path: root/t/t6500-gc.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-02-23 00:12:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-02-23 00:12:43 (GMT)
commitd68fccef86af1ceb5ae3a9abb02c8fe4f6ff3317 (patch)
tree020527039643bd7dcf1c498e6d1c90b2aabc612d /t/t6500-gc.sh
parent45df6c4d756df25d04f82f4803923baaf0c12a33 (diff)
parente7884b353b7f3b61c2b8ace086bc7e030946e270 (diff)
downloadgit-d68fccef86af1ceb5ae3a9abb02c8fe4f6ff3317.zip
git-d68fccef86af1ceb5ae3a9abb02c8fe4f6ff3317.tar.gz
git-d68fccef86af1ceb5ae3a9abb02c8fe4f6ff3317.tar.bz2
Merge branch 'ab/test-lib'
Test framework clean-up. * ab/test-lib: test-lib-functions: assert correct parameter count test-lib-functions: remove bug-inducing "diagnostics" helper param test libs: rename "diff-lib" to "lib-diff" t/.gitattributes: sort lines test-lib-functions: move function to lib-bitmap.sh test libs: rename gitweb-lib.sh to lib-gitweb.sh test libs: rename bundle helper to "lib-bundle.sh" test-lib-functions: remove generate_zero_bytes() wrapper test-lib-functions: move test_set_index_version() to its user test lib: change "error" to "BUG" as appropriate test-lib: remove check_var_migration
Diffstat (limited to 't/t6500-gc.sh')
-rwxr-xr-xt/t6500-gc.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
index f76586f..60d961b 100755
--- a/t/t6500-gc.sh
+++ b/t/t6500-gc.sh
@@ -78,7 +78,7 @@ test_expect_success 'gc --keep-largest-pack' '
git gc &&
( cd .git/objects/pack && ls *.pack ) >pack-list &&
test_line_count = 1 pack-list &&
- BASE_PACK=.git/objects/pack/pack-*.pack &&
+ cp pack-list base-pack-list &&
test_commit four &&
git repack -d &&
test_commit five &&
@@ -90,7 +90,7 @@ test_expect_success 'gc --keep-largest-pack' '
test_line_count = 2 pack-list &&
awk "/^P /{print \$2}" <.git/objects/info/packs >pack-info &&
test_line_count = 2 pack-info &&
- test_path_is_file $BASE_PACK &&
+ test_path_is_file .git/objects/pack/$(cat base-pack-list) &&
git fsck
)
'