diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-10-26 02:06:58 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-10-26 02:06:58 +0300 |
commit | 18c6653da0be924f83415f987d76f6813b81f086 (patch) | |
tree | b3b469940ddc93e6b6e736309f324eb20adf0428 /log-tree.c | |
parent | e058b1846c3b2051aab364d7b80e8c1696958a48 (diff) | |
parent | 1bfb57f642d34dc4b65be3602bb429abd9f32b58 (diff) |
Merge branch 'fs/ssh-signing'
Use ssh public crypto for object and push-cert signing.
* fs/ssh-signing:
ssh signing: test that gpg fails for unknown keys
ssh signing: tests for logs, tags & push certs
ssh signing: duplicate t7510 tests for commits
ssh signing: verify signatures using ssh-keygen
ssh signing: provide a textual signing_key_id
ssh signing: retrieve a default key from ssh-agent
ssh signing: add ssh key format and signing code
ssh signing: add test prereqs
ssh signing: preliminary refactoring and clean-up
Diffstat (limited to 'log-tree.c')
-rw-r--r-- | log-tree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/log-tree.c b/log-tree.c index 6dc4412268..644893fd8c 100644 --- a/log-tree.c +++ b/log-tree.c @@ -515,10 +515,10 @@ static void show_signature(struct rev_info *opt, struct commit *commit) status = check_signature(payload.buf, payload.len, signature.buf, signature.len, &sigc); - if (status && !sigc.gpg_output) + if (status && !sigc.output) show_sig_lines(opt, status, "No signature\n"); else - show_sig_lines(opt, status, sigc.gpg_output); + show_sig_lines(opt, status, sigc.output); signature_check_clear(&sigc); out: @@ -585,8 +585,8 @@ static int show_one_mergetag(struct commit *commit, /* could have a good signature */ status = check_signature(payload.buf, payload.len, signature.buf, signature.len, &sigc); - if (sigc.gpg_output) - strbuf_addstr(&verify_message, sigc.gpg_output); + if (sigc.output) + strbuf_addstr(&verify_message, sigc.output); else strbuf_addstr(&verify_message, "No signature\n"); signature_check_clear(&sigc); |