about summary refs log tree commit diff
path: root/tests/t0001-validate-git-versions.sh
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2022-02-13 12:07:49 -0500
committerJune McEnroe <june@causal.agency>2022-02-13 12:10:49 -0500
commit516175469a8c6895496ef909b487992deb45f460 (patch)
treee0e8b4d38f05e870089de8babc0d3aca3bb4d3b0 /tests/t0001-validate-git-versions.sh
parentFix crash trying to print "this commit" on 404s (diff)
parentgit: update to v2.32.0 (diff)
downloadcgit-pink-516175469a8c6895496ef909b487992deb45f460.tar.gz
cgit-pink-516175469a8c6895496ef909b487992deb45f460.zip
Merge up to git v2.32.0
Diffstat (limited to '')
-rwxr-xr-xtests/t0001-validate-git-versions.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/t0001-validate-git-versions.sh b/tests/t0001-validate-git-versions.sh
index 73bd32f..dd84fe3 100755
--- a/tests/t0001-validate-git-versions.sh
+++ b/tests/t0001-validate-git-versions.sh
@@ -33,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