diff options
| Commit | 779631c6dc23c15bbbf45a7c7ab9fffb619037b7 (patch) | |
|---|---|---|
| Author | 2020-10-20 23:32:45 +0200 | |
| Committer | 2020-10-20 23:57:12 +0200 | |
| Files | 99ddcae06134e97ef490fb1a4c9f6ab095ca5052 /tests | |
| cgit-779631c6dc23c15bbbf45a7c7ab9fffb619037b7.tar cgit-779631c6dc23c15bbbf45a7c7ab9fffb619037b7.tar.gz cgit-779631c6dc23c15bbbf45a7c7ab9fffb619037b7.zip | ||
| Parent | 629659d2cffbf059374fc53e6400ff0bebe1ddde (diff) | |
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>
1 files changed, 2 insertions, 2 deletions
| -rwxr-xr-x | tests/t0001-validate-git-versions.sh | 4 |
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' ' 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 |