diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-25 23:06:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-25 23:06:58 (GMT) |
| commit | 18c6653da0be924f83415f987d76f6813b81f086 (patch) | |
| tree | b3b469940ddc93e6b6e736309f324eb20adf0428 /pretty.c | |
| parent | e058b1846c3b2051aab364d7b80e8c1696958a48 (diff) | |
| parent | 1bfb57f642d34dc4b65be3602bb429abd9f32b58 (diff) | |
| download | git-18c6653da0be924f83415f987d76f6813b81f086.zip git-18c6653da0be924f83415f987d76f6813b81f086.tar.gz git-18c6653da0be924f83415f987d76f6813b81f086.tar.bz2 | |
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 'pretty.c')
| -rw-r--r-- | pretty.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1436,8 +1436,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ check_commit_signature(c->commit, &(c->signature_check)); switch (placeholder[1]) { case 'G': - if (c->signature_check.gpg_output) - strbuf_addstr(sb, c->signature_check.gpg_output); + if (c->signature_check.output) + strbuf_addstr(sb, c->signature_check.output); break; case '?': switch (c->signature_check.result) { |