diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-12 10:35:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 10:35:19 -0700 |
| commit | e8191a52657ecfc12928cfe9eada80a883111ef2 (patch) | |
| tree | 31e4a1539d8a8fd19e7c65de777f6bf9b577dfdf /pretty.c | |
| parent | 2a97289ad8b103625d3a1a12f66c27f50df822ce (diff) | |
| parent | 1bfb57f642d34dc4b65be3602bb429abd9f32b58 (diff) | |
| download | git-e8191a52657ecfc12928cfe9eada80a883111ef2.tar.gz | |
Merge branch 'fs/ssh-signing' into fs/ssh-signing-fix
* 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) { |