t5000: make hash independent

This test uses a stub of a very large (64 GB) object to test our
generation of tar archives.  In doing so, it uses the object ID of the
object so it can insert it into the database properly.  Look up these
values using test_oid.  Restructure the test slightly to use
test_oid_in_path.

Since we care about the object, not how it is named in a particular hash
algorithm, rename it to "huge-object", which is shorter and more
descriptive.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 602bfd9574350ae7f851d6aa26d978cc919f5c58..37655a237cb783142400364be845bf7279cc2758 100755 (executable)
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -94,6 +94,13 @@ check_tar() {
        '
 }
 
        '
 }
 

+test_expect_success 'setup' '
+       test_oid_cache <<-EOF
+       obj sha1:19f9c8273ec45a8938e6999cb59b3ff66739902a
+       obj sha256:3c666f798798601571f5cec0adb57ce4aba8546875e7693177e0535f34d2c49b
+       EOF
+'
+

 test_expect_success \
     'populate workdir' \
     'mkdir a &&
 test_expect_success \
     'populate workdir' \
     'mkdir a &&


@@ -369,11 +376,10 @@ test_lazy_prereq TAR_HUGE '
 '
 
 test_expect_success LONG_IS_64BIT 'set up repository with huge blob' '
 '
 
 test_expect_success LONG_IS_64BIT 'set up repository with huge blob' '

-       obj_d=19 &&
-       obj_f=f9c8273ec45a8938e6999cb59b3ff66739902a &&
-       obj=${obj_d}${obj_f} &&
-       mkdir -p .git/objects/$obj_d &&
-       cp "$TEST_DIRECTORY"/t5000/$obj .git/objects/$obj_d/$obj_f &&
+       obj=$(test_oid obj) &&
+       path=$(test_oid_to_path $obj) &&
+       mkdir -p .git/objects/$(dirname $path) &&
+       cp "$TEST_DIRECTORY"/t5000/huge-object .git/objects/$path &&

        rm -f .git/index &&
        git update-index --add --cacheinfo 100644,$obj,huge &&
        git commit -m huge
        rm -f .git/index &&
        git update-index --add --cacheinfo 100644,$obj,huge &&
        git commit -m huge

diff --git a/t/t5000/19f9c8273ec45a8938e6999cb59b3ff66739902a b/t/t5000/19f9c8273ec45a8938e6999cb59b3ff66739902a
deleted file mode 100644 (file)
index 5cbe9ec..0000000
Binary files a/t/t5000/19f9c8273ec45a8938e6999cb59b3ff66739902a and /dev/null differ

diff --git a/t/t5000/huge-object b/t/t5000/huge-object
new file mode 100644 (file)
index 0000000..5cbe9ec
Binary files /dev/null and b/t/t5000/huge-object differ