summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-16 22:04:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-16 22:04:13 (GMT)
commitaf2b21ec3cab346fcb19f5794eec6317330cd2a3 (patch)
tree4421225e18fe1d4692214030f7279e2276ef8540
parent07c92928f2b782330df6e78dd9d019e984d820a7 (diff)
parentb624a3e67f498cb41f704c9bd28e7d53076611c8 (diff)
downloadgit-af2b21ec3cab346fcb19f5794eec6317330cd2a3.zip
git-af2b21ec3cab346fcb19f5794eec6317330cd2a3.tar.gz
git-af2b21ec3cab346fcb19f5794eec6317330cd2a3.tar.bz2
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
-rw-r--r--gpg-interface.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/gpg-interface.c b/gpg-interface.c
index 08356f9..8672eda 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -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);