From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Mar 2015 18:23:19 +0000 (-0700)
Subject: Merge branch 'mg/verify-commit' into maint
X-Git-Tag: v2.3.4~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/82b6e331a4f07b6e0080f7d18b4189d53190a04e?hp=f63ed085e20da82a8b7b49d90c61d0eb1b2ed19d

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
---

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 &&