From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Mar 2015 21:13:03 +0000 (-0800)
Subject: Merge branch 'ch/new-gpg-drops-rfc-1991' into maint
X-Git-Tag: v2.3.2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab09f58e8ce57e44faf810ed049f8a8934989503;p=thirdparty%2Fgit.git

Merge branch 'ch/new-gpg-drops-rfc-1991' into maint

Older GnuPG implementations may not correctly import the keyring
material we prepare for the tests to use.

* ch/new-gpg-drops-rfc-1991:
  t/lib-gpg: sanity-check that we can actually sign
  t/lib-gpg: include separate public keys in keyring.gpg
---

ab09f58e8ce57e44faf810ed049f8a8934989503