summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2013-02-14 16:04:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-02-14 17:30:04 (GMT)
commit9cc4ac8ff1ae84f9435f2c7de3f7ab796103adba (patch)
tree7f5e079652c0ae7c107321c7b91cdead79240ccd /log-tree.c
parent1315093f99f327ff498ae6c8afcc42651bbddebc (diff)
downloadgit-9cc4ac8ff1ae84f9435f2c7de3f7ab796103adba.zip
git-9cc4ac8ff1ae84f9435f2c7de3f7ab796103adba.tar.gz
git-9cc4ac8ff1ae84f9435f2c7de3f7ab796103adba.tar.bz2
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 'log-tree.c')
-rw-r--r--log-tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/log-tree.c b/log-tree.c
index ff9522f..9cb78d1 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -434,7 +434,7 @@ static void show_signature(struct rev_info *opt, struct commit *commit)
status = verify_signed_buffer(payload.buf, payload.len,
signature.buf, signature.len,
- &gpg_output);
+ &gpg_output, NULL);
if (status && !gpg_output.len)
strbuf_addstr(&gpg_output, "No signature\n");
@@ -503,7 +503,7 @@ static void show_one_mergetag(struct rev_info *opt,
if (verify_signed_buffer(extra->value, payload_size,
extra->value + payload_size,
extra->len - payload_size,
- &verify_message)) {
+ &verify_message, NULL)) {
if (verify_message.len <= gpg_message_offset)
strbuf_addstr(&verify_message, "No signature\n");
else