diff options
| author | Christian Hesse | 2020-10-20 23:32:45 +0200 |
|---|---|---|
| committer | Christian Hesse | 2020-10-20 23:57:12 +0200 |
| commit | 779631c6dc23c15bbbf45a7c7ab9fffb619037b7 (patch) | |
| tree | 99ddcae06134e97ef490fb1a4c9f6ab095ca5052 /tests | |
| parent | git: update to v2.29.0 (diff) | |
| download | cgit-779631c6dc23c15bbbf45a7c7ab9fffb619037b7.tar.gz cgit-779631c6dc23c15bbbf45a7c7ab9fffb619037b7.zip | |
global: replace references to 'sha1' with 'oid'
For some time now sha1 is considered broken and upstream is working to replace it with sha256. Replace all references to 'sha1' with 'oid', just as upstream does. Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'tests')
| -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 |