merge(3p/cgit): subtree merge at adcc4f82
Change-Id: I16941629a17a2f39b9324cb85dc0cec6b104dfe4
This commit is contained in:
parent
f4609b896f
commit
1e81ce6622
26 changed files with 299 additions and 135 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue