On Wed, Jan 18, 2017 at 10:25:59AM -0800, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
> 
> > santiago@nyu.edu writes:
> >
> >> @@ -428,9 +443,12 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
> >>  	if (filter.merge_commit)
> >>  		die(_("--merged and --no-merged option are only allowed with -l"));
> >>  	if (cmdmode == 'd')
> >> -		return for_each_tag_name(argv, delete_tag);
> >> -	if (cmdmode == 'v')
> >> -		return for_each_tag_name(argv, verify_tag);
> >> +		return for_each_tag_name(argv, delete_tag, NULL);
> >> +	if (cmdmode == 'v') {
> >> +		if (format)
> >> +			verify_ref_format(format);
> >> +		return for_each_tag_name(argv, verify_tag, format);
> >> +	}
> >
> > This triggers:
> >
> >     builtin/tag.c: In function 'cmd_tag':
> >     builtin/tag.c:451:3: error: passing argument 3 of
> >     'for_each_tag_name' discards 'const' qualifier from pointer target type [-Werror]
> >        return for_each_tag_name(argv, verify_tag, format);
> >
> > Either for-each-tag-name's new parameter needs to be typed
> > correctly, or the type of the "format" variable needs to be updated.
> 
> Squashing the following into this commit solves this issue with the
> former approach.  The lines it touches are all from 4/6 and I view
> all of it as general improvement, including type correctness and
> code formatting.

Thanks!

Should I re-roll this really quick? Or would you rather apply this on
your tree directly? 

-Santiago.