git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 5/6] builtin/verify-tag: Add --format to verify-tag

From
Santiago Torres <santiago@nyu.edu>
Date
Sep 23, 2016, 14:35 UTC
Message-ID
<20160923143517.6afqausmuf7ugc43@LykOS.localdomain>
In-Reply-To
<xmqqintn3aai.fsf@gitster.mtv.corp.google.com>
On Thu, Sep 22, 2016 at 02:16:21PM -0700, Junio C Hamano wrote:
Show 60 quoted lines
> santiago@nyu.edu writes:
> 
> > From: Santiago Torres <santiago@nyu.edu>
> >
> > Callers of verify-tag may want to cross-check the tagname from refs/tags
> > with the tagname from the tag object header upon GPG verification. This
> > is to avoid tag refs that point to an incorrect object.
> >
> > Add a --format parameter to git verify-tag to print the formatted tag
> > object header in addition to or instead of the --verbose or --raw GPG
> > verification output.
> >
> > Signed-off-by: Santiago Torres <santiago@nyu.edu>
> > ---
> >  builtin/verify-tag.c | 13 +++++++++++--
> >  1 file changed, 11 insertions(+), 2 deletions(-)
> >
> > diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
> > index 7a1121b..319d469 100644
> > --- a/builtin/verify-tag.c
> > +++ b/builtin/verify-tag.c
> > @@ -12,12 +12,15 @@
> >  #include <signal.h>
> >  #include "parse-options.h"
> >  #include "gpg-interface.h"
> > +#include "ref-filter.h"
> >  
> >  static const char * const verify_tag_usage[] = {
> > -		N_("git verify-tag [-v | --verbose] <tag>..."),
> > +		N_("git verify-tag [-v | --verbose] [--format=<format>] <tag>..."),
> >  		NULL
> >  };
> >  
> > +char *fmt_pretty;
> 
> Does this have to be extern?  I do not think so; prepend "static "
> in front of it.
> 
> >  	while (i < argc) {
> >  		unsigned char sha1[20];
> >  		const char *name = argv[i++];
> >  		if (get_sha1(name, sha1))
> >  			had_error = !!error("tag '%s' not found.", name);
> >  		else {
> > -			if (verify_and_format_tag(sha1, name, NULL, flags))
> > +			if (verify_and_format_tag(sha1, name, fmt_pretty, flags))
> 
> OK.  The callchain from here is
> 
>     verify_and_format_tag()
>     -> run_gpg_verify()
>       -> print_signature_buffer()
> 
> so not cramming QUIET into the flags parameter that is already
> passed is cumbersome.  As I said in my earlier review, it would make
> more sense to have the conditional NOT in print_signature_buffer()
> but in its caller, but it still is OK to add GPG_VERIFY_QUIET bit
> to the flag, which you would check in run_gpg_verify() to decide not
> to call print_signature_buffer().
> 

Yeah, in retrospect, this sounds like a more reasonable approach than doing it on gpg-nterface. I'll keep the QUIET bit then.

Previous: Junio C HamanoNext: Stefan Beller
Message 17 of 19 in “Add --format to tag verification”
  1. 0/6 Add --format to tag verificationsantiago@nyu.edu, Sep 22, 2016
  2. 3/6 ref-filter: Expose wrappers for ref_item functionssantiago@nyu.edu, Sep 22, 2016
  3. Junio C HamanoSep 22, 2016
  4. 6/6 builtin/tag: add --format argument for tag -vsantiago@nyu.edu, Sep 22, 2016
  5. Junio C HamanoSep 22, 2016
  6. Santiago TorresSep 23, 2016
  7. 2/6 gpg-interface: add GPG_VERIFY_QUIET flagsantiago@nyu.edu, Sep 22, 2016
  8. Junio C HamanoSep 22, 2016
  9. Junio C HamanoSep 22, 2016
  10. 4/6 tag: add format specifier to gpg_verify_tagsantiago@nyu.edu, Sep 22, 2016
  11. Junio C HamanoSep 22, 2016
  12. Santiago TorresSep 23, 2016
  13. 1/6 builtin/tag: move format specifier to global varsantiago@nyu.edu, Sep 22, 2016
  14. Junio C HamanoSep 22, 2016
  15. 5/6 builtin/verify-tag: Add --format to verify-tagsantiago@nyu.edu, Sep 22, 2016
  16. Junio C HamanoSep 22, 2016
  17. Santiago TorresSep 23, 2016
  18. Stefan BellerSep 22, 2016
  19. Jakub NarębskiSep 24, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.