diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-28 17:43:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-28 17:43:17 (GMT) |
| commit | 0106b1d4be166fd4f7bcf0b901d50940c9f539e2 (patch) | |
| tree | ced58695d6c423f4ae0db505d095dbd3463fe592 /builtin | |
| parent | 72b006f4bfd30b7c5037c163efaf279ab65bea9c (diff) | |
| download | git-0106b1d4be166fd4f7bcf0b901d50940c9f539e2.zip git-0106b1d4be166fd4f7bcf0b901d50940c9f539e2.tar.gz git-0106b1d4be166fd4f7bcf0b901d50940c9f539e2.tar.bz2 | |
Revert "gpg-interface: prefer check_signature() for GPG verification"
This reverts commit 72b006f4bfd30b7c5037c163efaf279ab65bea9c, which
breaks the end-user experience when merging a signed tag without
having the public key. We should report "can't check because we
have no public key", but the code with this change claimed that
there was no signature.
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fmt-merge-msg.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index f7ed102..a461558 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -495,7 +495,6 @@ static void fmt_merge_msg_sigs(struct strbuf *out) enum object_type type; unsigned long size, len; char *buf = read_object_file(oid, &type, &size); - struct signature_check sigc = { 0 }; struct strbuf sig = STRBUF_INIT; if (!buf || type != OBJ_TAG) @@ -504,12 +503,10 @@ static void fmt_merge_msg_sigs(struct strbuf *out) if (size == len) ; /* merely annotated */ - else if (!check_signature(buf, len, buf + len, size - len, - &sigc)) { - strbuf_addstr(&sig, sigc.gpg_output); - signature_check_clear(&sigc); - } else - strbuf_addstr(&sig, "gpg verification failed.\n"); + else if (verify_signed_buffer(buf, len, buf + len, size - len, &sig, NULL)) { + if (!sig.len) + strbuf_addstr(&sig, "gpg verification failed.\n"); + } if (!tag_number++) { fmt_tag_signature(&tagbuf, &sig, buf, len); |