Skip to content

Commit af2b21e

Browse files
committed
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
2 parents 07c9292 + b624a3e commit af2b21e

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

gpg-interface.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
217217
argv_array_pushl(&gpg.args,
218218
gpg_program,
219219
"--status-fd=1",
220+
"--keyid-format=long",
220221
"--verify", temp.filename.buf, "-",
221222
NULL);
222223

0 commit comments

Comments
 (0)