diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-12 17:35:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 17:35:19 (GMT) |
| commit | e8191a52657ecfc12928cfe9eada80a883111ef2 (patch) | |
| tree | 31e4a1539d8a8fd19e7c65de777f6bf9b577dfdf /fmt-merge-msg.c | |
| parent | 2a97289ad8b103625d3a1a12f66c27f50df822ce (diff) | |
| parent | 1bfb57f642d34dc4b65be3602bb429abd9f32b58 (diff) | |
| download | git-e8191a52657ecfc12928cfe9eada80a883111ef2.zip git-e8191a52657ecfc12928cfe9eada80a883111ef2.tar.gz git-e8191a52657ecfc12928cfe9eada80a883111ef2.tar.bz2 | |
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 'fmt-merge-msg.c')
| -rw-r--r-- | fmt-merge-msg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index b969dc6..2901c5e 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -528,11 +528,11 @@ static void fmt_merge_msg_sigs(struct strbuf *out) buf = payload.buf; len = payload.len; if (check_signature(payload.buf, payload.len, sig.buf, - sig.len, &sigc) && - !sigc.gpg_output) + sig.len, &sigc) && + !sigc.output) strbuf_addstr(&sig, "gpg verification failed.\n"); else - strbuf_addstr(&sig, sigc.gpg_output); + strbuf_addstr(&sig, sigc.output); } signature_check_clear(&sigc); |