summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2019-12-21 19:49:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-15 22:06:19 (GMT)
commit08a9dd891c5808c2ab6e8b7fc5812e1f0cea1354 (patch)
treedc92648daa42a2adbbb554888525d916e4a53561
parent215b60bf079758405e4f396a2e68a00ec4d9e011 (diff)
downloadgit-08a9dd891c5808c2ab6e8b7fc5812e1f0cea1354.zip
git-08a9dd891c5808c2ab6e8b7fc5812e1f0cea1354.tar.gz
git-08a9dd891c5808c2ab6e8b7fc5812e1f0cea1354.tar.bz2
t4134: compute appropriate length constant
Instead of using a specific invalid hard-coded object ID, generate one of the appropriate length by looking one up in the translation tables. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t4134-apply-submodule.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t4134-apply-submodule.sh b/t/t4134-apply-submodule.sh
index 0043930..99ed4cc 100755
--- a/t/t4134-apply-submodule.sh
+++ b/t/t4134-apply-submodule.sh
@@ -8,6 +8,7 @@ test_description='git apply submodule tests'
. ./test-lib.sh
test_expect_success setup '
+ test_oid_init &&
cat > create-sm.patch <<EOF &&
diff --git a/dir/sm b/dir/sm
new file mode 160000
@@ -15,7 +16,7 @@ index 0000000..0123456
--- /dev/null
+++ b/dir/sm
@@ -0,0 +1 @@
-+Subproject commit 0123456789abcdef0123456789abcdef01234567
++Subproject commit $(test_oid numeric)
EOF
cat > remove-sm.patch <<EOF
diff --git a/dir/sm b/dir/sm
@@ -24,7 +25,7 @@ index 0123456..0000000
--- a/dir/sm
+++ /dev/null
@@ -1 +0,0 @@
--Subproject commit 0123456789abcdef0123456789abcdef01234567
+-Subproject commit $(test_oid numeric)
EOF
'