From 1e81ce6622ef790b297ff48f1d0286f51e225aee Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 21 Nov 2020 19:59:36 +0100 Subject: merge(3p/cgit): subtree merge at adcc4f82 Change-Id: I16941629a17a2f39b9324cb85dc0cec6b104dfe4 --- third_party/cgit/tests/t0001-validate-git-versions.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'third_party/cgit/tests/t0001-validate-git-versions.sh') diff --git a/third_party/cgit/tests/t0001-validate-git-versions.sh b/third_party/cgit/tests/t0001-validate-git-versions.sh index 3200f31101a0..dd84fe3fcb94 100755 --- a/third_party/cgit/tests/t0001-validate-git-versions.sh +++ b/third_party/cgit/tests/t0001-validate-git-versions.sh @@ -1,5 +1,9 @@ #!/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 @@ -29,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 -- cgit 1.4.1