diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-23 11:23:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-23 11:23:20 -0700 |
| commit | 82b6e331a4f07b6e0080f7d18b4189d53190a04e (patch) | |
| tree | 877876c908c69dabece15def9d6cefb809eea8e2 | |
| parent | f63ed085e20da82a8b7b49d90c61d0eb1b2ed19d (diff) | |
| parent | 3f88c1b524b47560a8ef520d7d702c95261d0a97 (diff) | |
| download | git-82b6e331a4f07b6e0080f7d18b4189d53190a04e.tar.gz git-82b6e331a4f07b6e0080f7d18b4189d53190a04e.tar.xz | |
Merge branch 'mg/verify-commit' into maint
Workarounds for certain build of GPG that triggered false breakage
in a test.
* mg/verify-commit:
t7510: do not fail when gpg warns about insecure memory
| -rwxr-xr-x | t/t7510-signed-commit.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh index 474dab381..3cef18cfd 100755 --- a/t/t7510-signed-commit.sh +++ b/t/t7510-signed-commit.sh @@ -86,8 +86,8 @@ test_expect_success GPG 'show signed commit with signature' ' git show -s --show-signature initial >show && git verify-commit -v initial >verify.1 2>verify.2 && git cat-file commit initial >cat && - grep -v "gpg: " show >show.commit && - grep "gpg: " show >show.gpg && + grep -v -e "gpg: " -e "Warning: " show >show.commit && + grep -e "gpg: " -e "Warning: " show >show.gpg && grep -v "^ " cat | grep -v "^gpgsig " >cat.commit && test_cmp show.commit commit && test_cmp show.gpg verify.2 && |