log-tree: rely upon the check in the gpg_interface
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>
Michael J Gruber committed
Feb 14, 2013 at 17:04 UTC
1315093f99f327ff498ae6c8afcc42651bbddebc
1 file changed
+11
-14
log-tree.c
+11
-14
@@ -498,20 +498,17 @@ static void show_one_mergetag(struct rev_info *opt,
498
gpg_message_offset = verify_message.len;
499
500
payload_size = parse_signature(extra->value, extra->len);
501
- if ((extra->len <= payload_size) ||
502
- (verify_signed_buffer(extra->value, payload_size,
503
- extra->value + payload_size,
504
- extra->len - payload_size,
505
- &verify_message) &&
506
- verify_message.len <= gpg_message_offset)) {
507
- strbuf_addstr(&verify_message, "No signature\n");
508
- status = -1;
509
- }
510
- else if (strstr(verify_message.buf + gpg_message_offset,
511
- ": Good signature from "))
512
- status = 0;
513
- else
514
- status = -1;
501
+ status = -1;
502
+ if (extra->len > payload_size)
503
+ if (verify_signed_buffer(extra->value, payload_size,
504
+ extra->value + payload_size,
505
+ extra->len - payload_size,
506
+ &verify_message)) {
507
+ if (verify_message.len <= gpg_message_offset)
508
+ strbuf_addstr(&verify_message, "No signature\n");
509
+ else
510
+ status = 0;
511
+ }
512
513
show_sig_lines(opt, status, verify_message.buf);
514
strbuf_release(&verify_message);