diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2013-02-14 17:04:44 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-14 09:30:04 -0800 |
| commit | 9cc4ac8ff1ae84f9435f2c7de3f7ab796103adba (patch) | |
| tree | 7f5e079652c0ae7c107321c7b91cdead79240ccd /builtin/fmt-merge-msg.c | |
| parent | 1315093f99f327ff498ae6c8afcc42651bbddebc (diff) | |
| download | git-9cc4ac8ff1ae84f9435f2c7de3f7ab796103adba.tar.gz | |
gpg_interface: allow to request status return
Currently, verify_signed_buffer() returns the user facing output only.
Allow callers to request the status output also.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 d9af43c257..69bf15a981 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"); } |