diff options
| author | Vincent Ambo <mail@tazj.in> | 2020-11-21T18·58+0100 |
|---|---|---|
| committer | Vincent Ambo <mail@tazj.in> | 2020-11-21T18·58+0100 |
| commit | 5d4756e75ce12a6b67af3a16193f10047ba05218 (patch) | |
| tree | d631c73d8c7a9d2856e4be6ac25faf1cbed588cd /tests/t0001-validate-git-versions.sh | |
| parent | 723dc8fbcb1a4609c264758eae420ee2811a2b55 (diff) | |
Squashed 'third_party/cgit/' changes from 8fc0c81bbb..adcc4f822f
adcc4f822f tests: try with commit-graph a1039ab175 tests: do not copy snapshots to /tmp/ a4de0e810b global: replace hard coded hash length 779631c6dc global: replace references to 'sha1' with 'oid' 629659d2cf git: update to v2.29.0 205837d468 git: update to v2.28.0 f780396c0a git: update to v2.27.0 0462f08d85 git: update to v2.26.0 55fa25adb0 Bump version 6a8d6d4b50 global: use proper accessors for maybe_tree 892ba8c3cc ui-snapshot: add support for zstd compression cc230bf044 tests: add tests for xz compressed snapshots 06671f4b21 ui-snapshot: add support for lzip compression fde897b817 git: update to v2.25.1 5e49023b01 tests: allow to skip git version tests fa146ccabd Bump version bd68c98879 git: update to v2.25.0 ca98c9e7bf tests: skip tests if strace is not functional d8e5dd25a0 git: update to v2.24.1 583aa5d80e ui-repolist: do not return unsigned (negative) value bfabd4519c git: update to v2.24.0 git-subtree-dir: third_party/cgit git-subtree-split: adcc4f822fe11836e5f942fc1ae0f00db4eb8d5f
Diffstat (limited to 'tests/t0001-validate-git-versions.sh')
| -rwxr-xr-x | tests/t0001-validate-git-versions.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/t0001-validate-git-versions.sh b/tests/t0001-validate-git-versions.sh index 3200f31101..dd84fe3fcb 100755 --- a/tests/t0001-validate-git-versions.sh +++ b/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 |