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

index 08356f9..8672eda 100644 (file)
@@ -217,6 +217,7 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
        argv_array_pushl(&gpg.args,
                         gpg_program,
                         "--status-fd=1",
+                        "--keyid-format=long",
                         "--verify", temp.filename.buf, "-",
                         NULL);