diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:22 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:22 +0900 |
| commit | 43af21409e04a9414e19aab76c99541c022607b0 (patch) | |
| tree | f12df2e939dc612cfdfd2395b706907cbd12982d | |
| parent | 7c7f6d828b5001feb138dd91bec12bffcf57e508 (diff) | |
| parent | d0fc552bfcc20dcb001f78e83b0138ea4374a8c1 (diff) | |
| download | git-43af21409e04a9414e19aab76c99541c022607b0.tar.gz | |
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
| -rw-r--r-- | t/lib-gpg.sh | 1 | ||||
| -rwxr-xr-x | t/t6300-for-each-ref.sh | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index 4eebd9c2b5..83b83c9abb 100644 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -45,6 +45,7 @@ test_lazy_prereq GPG ' "$TEST_DIRECTORY"/lib-gpg/keyring.gpg && gpg --homedir "${GNUPGHOME}" --import-ownertrust \ "$TEST_DIRECTORY"/lib-gpg/ownertrust && + gpg --homedir "${GNUPGHOME}" --update-trustdb && gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \ --sign -u committer@example.com ;; diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 1b84bf66e0..7b943fd34c 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -1774,10 +1774,7 @@ test_expect_success GPGSSH 'setup for signature atom using ssh' ' ' test_expect_success GPG2 'bare signature atom' ' - git verify-commit first-signed 2>out.raw && - grep -Ev "checking the trustdb|PGP trust model" out.raw >out && - head -3 out >expect && - tail -1 out >>expect && + git verify-commit first-signed 2>expect && echo >>expect && git for-each-ref refs/tags/first-signed \ --format="%(signature)" >actual && |