diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-20 13:11:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 13:11:51 -0700 |
| commit | 4c24385e80b333695470d3f4fdc28918a2d3108a (patch) | |
| tree | 0447083eb2e52fe0089c6d6ed7fa76dc0993299f | |
| parent | Merge branch 'km/imap-send-libcurl-options' (diff) | |
| parent | t7510: do not fail when gpg warns about insecure memory (diff) | |
| download | tgif-4c24385e80b333695470d3f4fdc28918a2d3108a.tar.xz | |
Merge branch 'mg/verify-commit'
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 474dab381a..3cef18cfda 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 && |