summaryrefslogtreecommitdiff
path: root/t/t7510-signed-commit.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-20 20:11:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-20 20:11:51 (GMT)
commit4c24385e80b333695470d3f4fdc28918a2d3108a (patch)
tree0447083eb2e52fe0089c6d6ed7fa76dc0993299f /t/t7510-signed-commit.sh
parent0a81977239c1b2aae3aa53c0895267b3ac2d5425 (diff)
parent3f88c1b524b47560a8ef520d7d702c95261d0a97 (diff)
downloadgit-4c24385e80b333695470d3f4fdc28918a2d3108a.zip
git-4c24385e80b333695470d3f4fdc28918a2d3108a.tar.gz
git-4c24385e80b333695470d3f4fdc28918a2d3108a.tar.bz2
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
Diffstat (limited to 't/t7510-signed-commit.sh')
-rwxr-xr-xt/t7510-signed-commit.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 474dab3..3cef18c 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 &&