summaryrefslogtreecommitdiff
path: root/gpg-interface.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-19 22:34:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-19 22:34:16 (GMT)
commit83d9eb0ad85eeb88cb1dce88cf86458c6d3e57f1 (patch)
tree5c8eb48924350d6cf20076b8e22af5445140428f /gpg-interface.c
parentd05d0e99665ecb67c3e8b9b3be40b12e9052a8b8 (diff)
parentaf2b21ec3cab346fcb19f5794eec6317330cd2a3 (diff)
downloadgit-83d9eb0ad85eeb88cb1dce88cf86458c6d3e57f1.zip
git-83d9eb0ad85eeb88cb1dce88cf86458c6d3e57f1.tar.gz
git-83d9eb0ad85eeb88cb1dce88cf86458c6d3e57f1.tar.bz2
Merge branch 'lt/gpg-show-long-key-in-signature-verification'
"git log --show-signature" and other commands that display the verification status of PGP signature now shows the longer key-id, as 32-bit key-id is so last century. * lt/gpg-show-long-key-in-signature-verification: gpg-interface: prefer "long" key format output when verifying pgp signatures
Diffstat (limited to 'gpg-interface.c')
-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);