mirror of
https://git.zx2c4.com/cgit
synced 2024-11-25 18:08:41 +00:00
d483e8f569
When testing modifications in Git that affect CGit, it is annoying to have t0001 failing simply because the Git version has a ".dirty" suffix when the version of Git there does indeed match that specified in the CGit makefile. Stop this by stripping the ".dirty" suffix from the GIT_VERSION variable. Note that this brings the "Git version" behaviour in line with the "submodule version" case which does not check if the working tree in git/ is modified. Signed-off-by: John Keeping <john@keeping.me.uk>
37 lines
924 B
Bash
Executable File
37 lines
924 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Check Git version is correct'
|
|
CGIT_TEST_NO_CREATE_REPOS=YesPlease
|
|
. ./setup.sh
|
|
|
|
test_expect_success 'extract Git version from Makefile' '
|
|
sed -n -e "/^GIT_VER[ ]*=/ {
|
|
s/^GIT_VER[ ]*=[ ]*//
|
|
p
|
|
}" ../../Makefile >makefile_version
|
|
'
|
|
|
|
test_expect_success 'test Git version matches Makefile' '
|
|
( cat ../../git/GIT-VERSION-FILE || echo "No GIT-VERSION-FILE" ) |
|
|
sed -e "s/GIT_VERSION[ ]*=[ ]*//" -e "s/\\.dirty$//" >git_version &&
|
|
test_cmp git_version makefile_version
|
|
'
|
|
|
|
test_expect_success 'test submodule version matches Makefile' '
|
|
if ! test -e ../../git/.git
|
|
then
|
|
echo "git/ is not a Git repository" >&2
|
|
else
|
|
(
|
|
cd ../.. &&
|
|
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_sha1
|
|
) | sed -e "s/^v//" >sm_version &&
|
|
test_cmp sm_version makefile_version
|
|
fi
|
|
'
|
|
|
|
test_done
|