Diffstat (limited to 'tests/t0001-validate-git-versions.sh')
| -rwxr-xr-x | tests/t0001-validate-git-versions.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tests/t0001-validate-git-versions.sh b/tests/t0001-validate-git-versions.sh index dd84fe3..a65b35e 100755 --- a/tests/t0001-validate-git-versions.sh +++ b/tests/t0001-validate-git-versions.sh @@ -1,9 +1,5 @@ #!/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 @@ -33,11 +29,11 @@ test_expect_success 'test submodule version matches Makefile' ' else ( cd ../.. && - sm_oid=$(git ls-files --stage -- git | + sm_sha1=$(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_oid - ) | sed -e "s/^v//" -e "s/-/./" >sm_version && + git describe --match "v[0-9]*" $sm_sha1 + ) | sed -e "s/^v//" >sm_version && test_cmp sm_version makefile_version fi ' |