From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Feb 2015 19:44:58 +0000 (-0800)
Subject: Merge branch 'ch/new-gpg-drops-rfc-1991'
X-Git-Tag: v2.4.0-rc0~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3e73b5b312c91b3232a13936392b564a96a3cd1;p=thirdparty%2Fgit.git

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

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

d3e73b5b312c91b3232a13936392b564a96a3cd1