Skip to content

Commit

Permalink
Merge branch 'mg/verify-commit' into maint
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Mar 23, 2015
2 parents f63ed08 + 3f88c1b commit 82b6e33
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions t/t7510-signed-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit 82b6e33

Please sign in to comment.