diff options
| author | June McEnroe | 2022-02-13 12:07:49 -0500 |
|---|---|---|
| committer | June McEnroe | 2022-02-13 12:10:49 -0500 |
| commit | 516175469a8c6895496ef909b487992deb45f460 (patch) | |
| tree | e0e8b4d38f05e870089de8babc0d3aca3bb4d3b0 /tests/t0001-validate-git-versions.sh | |
| parent | Fix crash trying to print "this commit" on 404s (diff) | |
| parent | git: update to v2.32.0 (diff) | |
| download | cgit-516175469a8c6895496ef909b487992deb45f460.tar.gz cgit-516175469a8c6895496ef909b487992deb45f460.zip | |
Merge up to git v2.32.0
Diffstat (limited to 'tests/t0001-validate-git-versions.sh')
| -rwxr-xr-x | tests/t0001-validate-git-versions.sh | 4 |
1 files changed, 2 insertions, 2 deletions
| diff --git a/tests/t0001-validate-git-versions.sh b/tests/t0001-validate-git-versions.sh index 73bd32f..dd84fe3 100755 --- a/tests/t0001-validate-git-versions.sh +++ b/tests/t0001-validate-git-versions.sh | |||
| @@ -33,10 +33,10 @@ test_expect_success 'test submodule version matches Makefile' ' | |||
| 33 | else | 33 | else |
| 34 | ( | 34 | ( |
| 35 | cd ../.. && | 35 | cd ../.. && |
| 36 | sm_sha1=$(git ls-files --stage -- git | | 36 | sm_oid=$(git ls-files --stage -- git | |
| 37 | sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") && | 37 | sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") && |
| 38 | cd git && | 38 | cd git && |
| 39 | git describe --match "v[0-9]*" $sm_sha1 | 39 | git describe --match "v[0-9]*" $sm_oid |
| 40 | ) | sed -e "s/^v//" -e "s/-/./" >sm_version && | 40 | ) | sed -e "s/^v//" -e "s/-/./" >sm_version && |
| 41 | test_cmp sm_version makefile_version | 41 | test_cmp sm_version makefile_version |
| 42 | fi | 42 | fi |