mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ref-filter: convert email atom parser to use err_bad_arg()

Browse Source 
The error message for a bogus argument to %(authoremail), etc, is:

   $ git for-each-ref --format='%(authoremail:foo)'
   fatal: unrecognized email option: foo

Saying just "email" is a little vague; most of the other atom parsers
would use the full name "%(authoremail)", but we can't do that here
because the same function also handles %(taggeremail), etc. Until
recently, passing atom->name was a bad idea, because it erroneously
included the arguments in the atom name. But since the previous commit
taught err_bad_arg() to handle this, we can now do so and get:

  fatal: unrecognized %(authoremail) argument: foo

which is consistent with other atoms.

Signed-off-by: Jeff King <peff@peff.net>
Acked-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2022-12-14 11:24:03 -05:00
committed by Junio C Hamano
parent 1955ef10ed
commit 285da4321a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ref-filter.c
View File

@ -489,7 +489,7 @@ static int person_email_atom_parser(struct ref_format *format, struct used_atom
else if (!strcmp(arg, "localpart")) else if (!strcmp(arg, "localpart"))
atom->u.email_option.option = EO_LOCALPART; atom->u.email_option.option = EO_LOCALPART;
else else
return strbuf_addf_ret(err, -1, _("unrecognized email option: %s"), arg); return err_bad_arg(err, atom->name, arg);
return 0; return 0;
} }