about summary refs log tree commit diff
path: root/third_party/cgit/tests/t0001-validate-git-versions.sh
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2020-11-21T18·59+0100
committerVincent Ambo <mail@tazj.in>2020-11-21T19·09+0100
commit1e81ce6622ef790b297ff48f1d0286f51e225aee (patch)
tree152c022824a5cd4970bb41daa1fe94937b87a0e9 /third_party/cgit/tests/t0001-validate-git-versions.sh
parentf4609b896fac842433bd495c166d5987852a6a73 (diff)
merge(3p/cgit): subtree merge at adcc4f82 r/1891
Change-Id: I16941629a17a2f39b9324cb85dc0cec6b104dfe4
Diffstat (limited to 'third_party/cgit/tests/t0001-validate-git-versions.sh')
-rwxr-xr-xthird_party/cgit/tests/t0001-validate-git-versions.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/third_party/cgit/tests/t0001-validate-git-versions.sh b/third_party/cgit/tests/t0001-validate-git-versions.sh
index 3200f31101a0..dd84fe3fcb94 100755
--- a/third_party/cgit/tests/t0001-validate-git-versions.sh
+++ b/third_party/cgit/tests/t0001-validate-git-versions.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+if [ "${CGIT_TEST_NO_GIT_VERSION}" = "YesPlease" ]; then
+	exit 0
+fi
+
 test_description='Check Git version is correct'
 CGIT_TEST_NO_CREATE_REPOS=YesPlease
 . ./setup.sh
@@ -29,10 +33,10 @@ test_expect_success 'test submodule version matches Makefile' '
 	else
 		(
 			cd ../.. &&
-			sm_sha1=$(git ls-files --stage -- git |
+			sm_oid=$(git ls-files --stage -- git |
 				sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9]	.*$/\\1/") &&
 			cd git &&
-			git describe --match "v[0-9]*" $sm_sha1
+			git describe --match "v[0-9]*" $sm_oid
 		) | sed -e "s/^v//" -e "s/-/./" >sm_version &&
 		test_cmp sm_version makefile_version
 	fi