undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ref-filter: factor out "unrecognized %(foo) arg" errors

Browse Source 
Atom parsers that take arguments generally have a catch-all for "this
arg is not recognized". Most of them use the same printf template, which
is good, because it makes life easier for translators. Let's pull this
template into a helper function, which makes the code in the parsers
shorter and avoids any possibility of differences.

As with the previous commit, we'll pick an arbitrary atom to make sure
the test suite covers this code.

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:20:19 -05:00 committed by Junio C Hamano
parent a33d0fae76
commit dda4fc1a84
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ref-filter.c
View File

@ -234,6 +234,12 @@ static int err_no_arg(struct strbuf *sb, const char *name)
return -1; return -1;
} }
static int err_bad_arg(struct strbuf *sb, const char *name, const char *arg)
{
strbuf_addf(sb, _("unrecognized %%(%s) argument: %s"), name, arg);
return -1;
}
static int color_atom_parser(struct ref_format *format, struct used_atom *atom, static int color_atom_parser(struct ref_format *format, struct used_atom *atom,
const char *color_value, struct strbuf *err) const char *color_value, struct strbuf *err)
{ {
@ -347,7 +353,7 @@ static int objectsize_atom_parser(struct ref_format *format, struct used_atom *a
else else
oi.info.disk_sizep = &oi.disk_size; oi.info.disk_sizep = &oi.disk_size;
} else } else
return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "objectsize", arg); return err_bad_arg(err, "objectsize", arg);
return 0; return 0;
} }
@ -380,7 +386,7 @@ static int subject_atom_parser(struct ref_format *format, struct used_atom *atom
else if (!strcmp(arg, "sanitize")) else if (!strcmp(arg, "sanitize"))
atom->u.contents.option = C_SUB_SANITIZE; atom->u.contents.option = C_SUB_SANITIZE;
else else
return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "subject", arg); return err_bad_arg(err, "subject", arg);
return 0; return 0;
} }
@ -434,7 +440,7 @@ static int contents_atom_parser(struct ref_format *format, struct used_atom *ato
if (strtoul_ui(arg, 10, &atom->u.contents.nlines)) if (strtoul_ui(arg, 10, &atom->u.contents.nlines))
return strbuf_addf_ret(err, -1, _("positive value expected contents:lines=%s"), arg); return strbuf_addf_ret(err, -1, _("positive value expected contents:lines=%s"), arg);
} else } else
return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "contents", arg); return err_bad_arg(err, "contents", arg);
return 0; return 0;
} }
@ -446,7 +452,7 @@ static int raw_atom_parser(struct ref_format *format, struct used_atom *atom,
else if (!strcmp(arg, "size")) else if (!strcmp(arg, "size"))
atom->u.raw_data.option = RAW_LENGTH; atom->u.raw_data.option = RAW_LENGTH;
else else
return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "raw", arg); return err_bad_arg(err, "raw", arg);
return 0; return 0;
} }
@ -563,7 +569,7 @@ static int if_atom_parser(struct ref_format *format, struct used_atom *atom,
} else if (skip_prefix(arg, "notequals=", &atom->u.if_then_else.str)) { } else if (skip_prefix(arg, "notequals=", &atom->u.if_then_else.str)) {
atom->u.if_then_else.cmp_status = COMPARE_UNEQUAL; atom->u.if_then_else.cmp_status = COMPARE_UNEQUAL;
} else } else
return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "if", arg); return err_bad_arg(err, "if", arg);
return 0; return 0;
} }

6
t/t6300-for-each-ref.sh
View File

@ -1248,6 +1248,12 @@ test_expect_success 'HEAD atom does not take arguments' '
test_cmp expect err test_cmp expect err
' '
test_expect_success 'subject atom rejects unknown arguments' '
test_must_fail git for-each-ref --format="%(subject:foo)" 2>err &&
echo "fatal: unrecognized %(subject) argument: foo" >expect &&
test_cmp expect err
'
test_expect_success 'trailer parsing not fooled by --- line' ' test_expect_success 'trailer parsing not fooled by --- line' '
git commit --allow-empty -F - <<-\EOF && git commit --allow-empty -F - <<-\EOF &&
this is the subject this is the subject