aboutsummaryrefslogtreecommitdiffstats
path: root/tests/t0001-validate-git-versions.sh
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2022-05-01 11:08:26 +0200
committerFlorian Pritz <bluewind@xinu.at>2022-05-01 11:08:26 +0200
commit4f1bc7f9aa57da2ca84b475d472e23e22cc41e95 (patch)
tree37e7aec5ddc583047da1126ffdc41a81f20cf1f6 /tests/t0001-validate-git-versions.sh
parent2cbdd90e0f8575eda6486b4bb06521d848eaa307 (diff)
parent5258c297ba6fb604ae1415fbc19a3fe42457e49e (diff)
downloadcgit-local.tar.gz
cgit-local.tar.xz
Merge remote-tracking branch 'jason/master' into localHEADlocal
Diffstat (limited to 'tests/t0001-validate-git-versions.sh')
-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