From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-5.8 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 505E220756 for ; Tue, 17 Jan 2017 17:30:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751293AbdAQRaI (ORCPT ); Tue, 17 Jan 2017 12:30:08 -0500 Received: from cloud.peff.net ([104.130.231.41]:40283 "EHLO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750932AbdAQRaG (ORCPT ); Tue, 17 Jan 2017 12:30:06 -0500 Received: (qmail 13068 invoked by uid 109); 17 Jan 2017 17:30:06 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.84) with SMTP; Tue, 17 Jan 2017 17:30:06 +0000 Received: (qmail 19304 invoked by uid 111); 17 Jan 2017 17:31:00 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) by peff.net (qpsmtpd/0.84) with SMTP; Tue, 17 Jan 2017 12:31:00 -0500 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Tue, 17 Jan 2017 12:30:04 -0500 Date: Tue, 17 Jan 2017 12:30:04 -0500 From: Jeff King To: Santiago Torres Cc: git@vger.kernel.org, gitster@pobox.com, sunshine@sunshineco.com, walters@verbum.org, Lukas Puehringer Subject: Re: [PATCH v5 3/7] tag: add format specifier to gpg_verify_tag Message-ID: <20170117173003.sgipqc2cijpdrukb@sigill.intra.peff.net> References: <20170115184705.10376-1-santiago@nyu.edu> <20170115184705.10376-4-santiago@nyu.edu> <20170117152455.k6zkeclsyawzpl2n@sigill.intra.peff.net> <20170117153019.gujiruwghkwfklgv@sigill.intra.peff.net> <20170117165724.2hbyfdzrhrmro54b@LykOS.localdomain> <20170117172531.bahjekbj3om43gtq@sigill.intra.peff.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20170117172531.bahjekbj3om43gtq@sigill.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Tue, Jan 17, 2017 at 12:25:31PM -0500, Jeff King wrote: > Actually, looking at the callsites, I think they are fine to just call > pretty_print_ref() themselves, and I don't think it actually matters if > it happens before or after the verification. Oh, sorry, I misread it. We do indeed early-return from the verification and skip the printing in that case. So it'd be more like: diff --git a/builtin/tag.c b/builtin/tag.c index 9da11e0c2..068f392b6 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -114,7 +114,11 @@ static int verify_tag(const char *name, const char *ref, if (fmt_pretty) flags = GPG_VERIFY_QUIET; - return verify_and_format_tag(sha1, ref, fmt_pretty, flags); + if (gpg_verify_tag(sha1, ref, flags)) + return -1; + + pretty_print_ref(name, sha1, fmt_pretty); + return 0; } static int do_sign(struct strbuf *buffer) diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c index 212449f47..b3f08f705 100644 --- a/builtin/verify-tag.c +++ b/builtin/verify-tag.c @@ -58,10 +58,19 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix) while (i < argc) { unsigned char sha1[20]; const char *name = argv[i++]; - if (get_sha1(name, sha1)) + + if (get_sha1(name, sha1)) { had_error = !!error("tag '%s' not found.", name); - else if (verify_and_format_tag(sha1, name, fmt_pretty, flags)) + continue; + } + + if (gpg_verify_tag(sha1, name, flags)) { had_error = 1; + continue; + } + + if (fmt_pretty) + pretty_print_ref(name, sha1, fmt_pretty); } return had_error; } which I think is still an improvement (the printing, rather than being an obscure parameter to the overloaded verify_and_format_tag() function, is clearly a first-class operation). -Peff