mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

log-tree: rely upon the check in the gpg_interface

Browse Source 
It's just so much clearer.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael J Gruber
2013-02-14 17:04:43 +01:00
committed by Junio C Hamano
parent b60b7566c0
commit 1315093f99
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
log-tree.c
View File

@ -498,20 +498,17 @@ static void show_one_mergetag(struct rev_info *opt,
gpg_message_offset = verify_message.len; gpg_message_offset = verify_message.len;
payload_size = parse_signature(extra->value, extra->len); payload_size = parse_signature(extra->value, extra->len);
if ((extra->len <= payload_size) || status = -1;
(verify_signed_buffer(extra->value, payload_size, if (extra->len > payload_size)
if (verify_signed_buffer(extra->value, payload_size,
extra->value + payload_size, extra->value + payload_size,
extra->len - payload_size, extra->len - payload_size,
&verify_message) && &verify_message)) {
verify_message.len <= gpg_message_offset)) { if (verify_message.len <= gpg_message_offset)
strbuf_addstr(&verify_message, "No signature\n"); strbuf_addstr(&verify_message, "No signature\n");
status = -1;
}
else if (strstr(verify_message.buf + gpg_message_offset,
": Good signature from "))
status = 0;
else else
status = -1; status = 0;
}
show_sig_lines(opt, status, verify_message.buf); show_sig_lines(opt, status, verify_message.buf);
strbuf_release(&verify_message); strbuf_release(&verify_message);