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 | d7bd11e9b326caad68b88ae5804b7b97c9282c16 (patch) | |
| tree | 14b07a9e9865abc4c57513189e31af0afb6358fa /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-d7bd11e9b326caad68b88ae5804b7b97c9282c16.tar.gz src-d7bd11e9b326caad68b88ae5804b7b97c9282c16.zip | |
Merge commit 'f46c4521d761a0b9909e17ef29065c0aa09c7ab7'
Diffstat (limited to '')
| -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 |