diff options
| author | Kyle J. McKay <mackyle@gmail.com> | 2015-03-09 20:03:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-10 22:25:22 (GMT) |
| commit | 3f88c1b524b47560a8ef520d7d702c95261d0a97 (patch) | |
| tree | 024ff180dbd52d429c36142d53297615d81a509e | |
| parent | 8e92c2cf37038a3b3bb82724f018e4d0ab1180ff (diff) | |
| download | git-3f88c1b524b47560a8ef520d7d702c95261d0a97.zip git-3f88c1b524b47560a8ef520d7d702c95261d0a97.tar.gz git-3f88c1b524b47560a8ef520d7d702c95261d0a97.tar.bz2 | |
t7510: do not fail when gpg warns about insecure memory
Depending on how gpg was built, it may issue the following
message to stderr when run:
Warning: using insecure memory!
When the test is collecting gpg output it is therefore not
enough to just match on a "gpg: " prefix it must also match
on a "Warning: " prefix wherever it needs to match lines
that have been produced by gpg.
Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
Acked-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 dd4b948..c24d382 100755 --- a/t/t7510-signed-commit.sh +++ b/t/t7510-signed-commit.sh @@ -73,8 +73,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 && |