kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ch/t6300-verify-commit-test-cleanup' into maint-2.42 

Test clean-up.

* ch/t6300-verify-commit-test-cleanup:
  t/t6300: drop magic filtering
  t/lib-gpg: forcibly run a trustdb update
maint
Junio C Hamano 2023-11-02 16:53:22 +09:00
parent 7c7f6d828b d0fc552bfc
commit 43af21409e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
t/lib-gpg.sh
View File

@ -45,6 +45,7 @@ test_lazy_prereq GPG '
"$TEST_DIRECTORY"/lib-gpg/keyring.gpg && "$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
gpg --homedir "${GNUPGHOME}" --import-ownertrust \ gpg --homedir "${GNUPGHOME}" --import-ownertrust \
"$TEST_DIRECTORY"/lib-gpg/ownertrust && "$TEST_DIRECTORY"/lib-gpg/ownertrust &&
gpg --homedir "${GNUPGHOME}" --update-trustdb &&
gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \ gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
--sign -u committer@example.com --sign -u committer@example.com
;; ;;

5
t/t6300-for-each-ref.sh
View File

@ -1774,10 +1774,7 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' '
' '


test_expect_success GPG2 'bare signature atom' ' test_expect_success GPG2 'bare signature atom' '
git verify-commit first-signed 2>out.raw && git verify-commit first-signed 2>expect &&
grep -Ev "checking the trustdb|PGP trust model" out.raw >out &&
head -3 out >expect &&
tail -1 out >>expect &&
echo >>expect && echo >>expect &&
git for-each-ref refs/tags/first-signed \ git for-each-ref refs/tags/first-signed \
--format="%(signature)" >actual && --format="%(signature)" >actual &&