diff options
author | June McEnroe <june@causal.agency> | 2021-06-08 14:30:12 -0400 |
---|---|---|
committer | June McEnroe <june@causal.agency> | 2021-06-08 14:34:33 -0400 |
commit | 044df6aad5675524c0b1051cfee03e1c8b2abd0e (patch) | |
tree | 0cca093309d205972a2643210e8f96e4a30a1c4e /www/git.causal.agency/cgit/tests/t0001-validate-git-versions.sh | |
parent | Fetch git .tar.gz for compatibility (diff) | |
parent | Squashed 'www/git.causal.agency/cgit/' changes from 55fa25ad..5258c297 (diff) | |
download | src-044df6aad5675524c0b1051cfee03e1c8b2abd0e.tar.gz src-044df6aad5675524c0b1051cfee03e1c8b2abd0e.zip |
Merge commit '5213546273ee798369ff594ad60077f1bef4655e'
Diffstat (limited to 'www/git.causal.agency/cgit/tests/t0001-validate-git-versions.sh')
-rwxr-xr-x | www/git.causal.agency/cgit/tests/t0001-validate-git-versions.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/www/git.causal.agency/cgit/tests/t0001-validate-git-versions.sh b/www/git.causal.agency/cgit/tests/t0001-validate-git-versions.sh index 73bd32f5..dd84fe3f 100755 --- a/www/git.causal.agency/cgit/tests/t0001-validate-git-versions.sh +++ b/www/git.causal.agency/cgit/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 |