Merge branch 'lt/gpg-show-long-key-in-signature-verification-maint' into lt/gpg-show...
commitaf2b21ec3cab346fcb19f5794eec6317330cd2a3
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2016 22:04:13 +0000 (16 15:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2016 22:04:13 +0000 (16 15:04 -0700)
tree4421225e18fe1d4692214030f7279e2276ef8540
parent07c92928f2b782330df6e78dd9d019e984d820a7
parentb624a3e67f498cb41f704c9bd28e7d53076611c8
Merge branch 'lt/gpg-show-long-key-in-signature-verification-maint' into lt/gpg-show-long-key-in-signature-verification

Linus's original was rebased to apply to the maintenance track just
in case binary distributors that are stuck in the past want to take
it to their older codebase.  Let's merge it up to more modern
codebase that has Peff's gpg-interface clean-up topic that appeared
after Git 2.9 was tagged.

* lt/gpg-show-long-key-in-signature-verification-maint:
  gpg-interface: prefer "long" key format output when verifying pgp signatures
gpg-interface.c