Merge branch 'nd/upload-pack-shallow'

diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index d2b0c45ccae162ce443afa2b9b288e652add5607..d3a3afaba821f8b70c5f365f1046ba7a707e5085 100755 (executable)
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -14,7 +14,8 @@ test_expect_success 'setup repo with moderate-sized history' '
        git checkout master &&
        blob=$(echo tagged-blob | git hash-object -w --stdin) &&
        git tag tagged-blob $blob &&
-       git config pack.writebitmaps true
+       git config pack.writebitmaps true &&
+       git config pack.writebitmaphashcache true
 '
 
 test_expect_success 'full repack creates bitmaps' '