mirror of
https://github.com/git/git.git
synced 2024-11-19 08:25:21 +01:00
Make for-each-ref allow atom names like "<name>:<something>"
In anticipation of supplying a per-field date format specifier, this patch makes parse_atom() in builtin-for-each-ref.c allow atoms that have a valid atom name (as determined by the valid_atom[] table) followed by a colon, followed by an arbitrary string. The arbitrary string is where the format for the atom will be specified. Note, if different formats are specified for the same atom, multiple entries will be made in the used_atoms table to allow them to be distinguished by the grab_XXXX() functions. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
856665f827
commit
b64265ca8d
@ -106,7 +106,16 @@ static int parse_atom(const char *atom, const char *ep)
|
|||||||
/* Is the atom a valid one? */
|
/* Is the atom a valid one? */
|
||||||
for (i = 0; i < ARRAY_SIZE(valid_atom); i++) {
|
for (i = 0; i < ARRAY_SIZE(valid_atom); i++) {
|
||||||
int len = strlen(valid_atom[i].name);
|
int len = strlen(valid_atom[i].name);
|
||||||
if (len == ep - sp && !memcmp(valid_atom[i].name, sp, len))
|
/*
|
||||||
|
* If the atom name has a colon, strip it and everything after
|
||||||
|
* it off - it specifies the format for this entry, and
|
||||||
|
* shouldn't be used for checking against the valid_atom
|
||||||
|
* table.
|
||||||
|
*/
|
||||||
|
const char *formatp = strchr(sp, ':');
|
||||||
|
if (!formatp)
|
||||||
|
formatp = ep;
|
||||||
|
if (len == formatp - sp && !memcmp(valid_atom[i].name, sp, len))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user