diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-21 14:02:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-21 14:02:55 -0700 |
| commit | 0f6875dbe2598fd2e9a597a9e42cde4a507140dd (patch) | |
| tree | 9934b604245af8bb26f1c9b2c8198a6c46a34284 /builtin/fmt-merge-msg.c | |
| parent | dcf0d12aed0d4627dcbfdbc52cea75ce74103e46 (diff) | |
| parent | 0174eeaa736226a0bea19e9bf88c270d61aa9cce (diff) | |
| download | git-0f6875dbe2598fd2e9a597a9e42cde4a507140dd.tar.gz | |
Merge branch 'mg/gpg-interface-using-status'
Call "gpg" using the right API when validating the signature on
tags.
* mg/gpg-interface-using-status:
pretty: make %GK output the signing key for signed commits
pretty: parse the gpg status lines rather than the output
gpg_interface: allow to request status return
log-tree: rely upon the check in the gpg_interface
gpg-interface: check good signature in a reliable way
Diffstat (limited to 'builtin/fmt-merge-msg.c')
| -rw-r--r-- | builtin/fmt-merge-msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index b49612f0ce..265a9253bf 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -492,7 +492,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out) if (size == len) ; /* merely annotated */ - else if (verify_signed_buffer(buf, len, buf + len, size - len, &sig)) { + else if (verify_signed_buffer(buf, len, buf + len, size - len, &sig, NULL)) { if (!sig.len) strbuf_addstr(&sig, "gpg verification failed.\n"); } |