Merge branch 'bc/sha-256-part-2'

[thirdparty/git.git] / t / t5300-pack-object.sh

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 410a09b0dd756c90b8a47dbfc9c0e7ee048e4557..746cdb626e293f840a9e3f910ec5d421a67fb9ca 100755 (executable)
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -12,7 +12,8 @@ TRASH=$(pwd)
 
 test_expect_success \
     'setup' \
 
 test_expect_success \
     'setup' \

-    'rm -f .git/index* &&
+    'test_oid_init &&
+     rm -f .git/index* &&

      perl -e "print \"a\" x 4096;" > a &&
      perl -e "print \"b\" x 4096;" > b &&
      perl -e "print \"c\" x 4096;" > c &&
      perl -e "print \"a\" x 4096;" > a &&
      perl -e "print \"b\" x 4096;" > b &&
      perl -e "print \"c\" x 4096;" > c &&


@@ -412,18 +413,18 @@ test_expect_success 'set up pack for non-repo tests' '
 '
 
 test_expect_success 'index-pack --stdin complains of non-repo' '
 '
 
 test_expect_success 'index-pack --stdin complains of non-repo' '

-       nongit test_must_fail git index-pack --stdin <foo.pack &&
+       nongit test_must_fail git index-pack --object-format=$(test_oid algo) --stdin <foo.pack &&

        test_path_is_missing non-repo/.git
 '
 
 test_expect_success 'index-pack <pack> works in non-repo' '
        test_path_is_missing non-repo/.git
 '
 
 test_expect_success 'index-pack <pack> works in non-repo' '

-       nongit git index-pack ../foo.pack &&
+       nongit git index-pack --object-format=$(test_oid algo) ../foo.pack &&

        test_path_is_file foo.idx
 '
 
 test_expect_success 'index-pack --strict <pack> works in non-repo' '
        rm -f foo.idx &&
        test_path_is_file foo.idx
 '
 
 test_expect_success 'index-pack --strict <pack> works in non-repo' '
        rm -f foo.idx &&

-       nongit git index-pack --strict ../foo.pack &&
+       nongit git index-pack --strict --object-format=$(test_oid algo) ../foo.pack &&

        test_path_is_file foo.idx
 '
 
        test_path_is_file foo.idx
 '