Merge branch 'ea/blame-use-oideq'

[thirdparty/git.git] / t / t6500-gc.sh

diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
index 0a69a6711768c8fac564481d0cdbddf19a0d2e8c..4a3b8f48ac638d05759377524c0e9566e36e94a9 100755 (executable)
--- a/t/t6500-gc.sh
+++ b/t/t6500-gc.sh
@@ -10,7 +10,24 @@ test_expect_success 'setup' '
        # do not let the amount of physical memory affects gc
        # behavior, make sure we always pack everything to one pack by
        # default
-       git config gc.bigPackThreshold 2g
+       git config gc.bigPackThreshold 2g &&
+
+       # These are simply values which, when hashed as a blob with a newline,
+       # produce a hash where the first byte is 0x17 in their respective
+       # algorithms.
+       test_oid_cache <<-EOF
+       obj1 sha1:263
+       obj1 sha256:34
+
+       obj2 sha1:410
+       obj2 sha256:174
+
+       obj3 sha1:523
+       obj3 sha256:313
+
+       obj4 sha1:790
+       obj4 sha256:481
+       EOF
 '
 
 test_expect_success 'gc empty repository' '
@@ -85,13 +102,13 @@ test_expect_success 'auto gc with too many loose objects does not attempt to cre
        # We need to create two object whose sha1s start with 17
        # since this is what git gc counts.  As it happens, these
        # two blobs will do so.
-       test_commit 263 &&
-       test_commit 410 &&
+       test_commit "$(test_oid obj1)" &&
+       test_commit "$(test_oid obj2)" &&
        # Our first gc will create a pack; our second will create a second pack
        git gc --auto &&
        ls .git/objects/pack | sort >existing_packs &&
-       test_commit 523 &&
-       test_commit 790 &&
+       test_commit "$(test_oid obj3)" &&
+       test_commit "$(test_oid obj4)" &&
 
        git gc --auto 2>err &&
        test_i18ngrep ! "^warning:" err &&