santi...@nyu.edu writes:

> From: Santiago Torres <santi...@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 <santi...@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 de10198..a941053 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
>  };
>  
> +static char *fmt_pretty;
> +

I'd suggest to remove this, and then ...

>  static int git_verify_tag_config(const char *var, const char *value, void 
> *cb)
>  {
>       int status = git_gpg_config(var, value, cb);
> @@ -33,6 +36,7 @@ int cmd_verify_tag(int argc, const char **argv, const char 
> *prefix)

... instead add

        char *fmt_pretty = NULL;

here, imitating the way "&flags" is handled.  You do not need it to
be visible outside the function.

>       const struct option verify_tag_options[] = {
>               OPT__VERBOSE(&verbose, N_("print tag contents")),
>               OPT_BIT(0, "raw", &flags, N_("print raw gpg status output"), 
> GPG_VERIFY_RAW),
> +             OPT_STRING(  0 , "format", &fmt_pretty, N_("format"), 
> N_("format to use for the output")),
>               OPT_END()
>       };
>  
> @@ -46,12 +50,17 @@ int cmd_verify_tag(int argc, const char **argv, const 
> char *prefix)
>       if (verbose)
>               flags |= GPG_VERIFY_VERBOSE;
>  
> +     if (fmt_pretty) {
> +             verify_ref_format(fmt_pretty);
> +             flags |= GPG_VERIFY_QUIET;
> +     }
> +
>       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))
> +             else if (verify_and_format_tag(sha1, name, fmt_pretty, flags))
>                       had_error = 1;
>       }
>       return had_error;

Reply via email to