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

ref-filter: modify error messages in grab_objectname()

Browse Source 
As we plan to use `grab_objectname()` for `tree` and `parent` atom,
it's better to parameterize the error messages in the function
`grab_objectname()` where "objectname" is hard coded.

Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored-by: Heba Waly <heba.waly@gmail.com>
Signed-off-by: Hariom Verma <hariom18599@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Hariom Verma 2020-08-21 21:41:45 +00:00 committed by Junio C Hamano
parent 5101100dcc
commit e7601eb55b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ref-filter.c
View File

@ -372,11 +372,11 @@ static int objectname_atom_parser(const struct ref_format *format, struct used_a
atom->u.objectname.option = O_LENGTH; atom->u.objectname.option = O_LENGTH;
if (strtoul_ui(arg, 10, &atom->u.objectname.length) || if (strtoul_ui(arg, 10, &atom->u.objectname.length) ||
atom->u.objectname.length == 0) atom->u.objectname.length == 0)
return strbuf_addf_ret(err, -1, _("positive value expected objectname:short=%s"), arg); return strbuf_addf_ret(err, -1, _("positive value expected '%s' in %%(%s)"), arg, atom->name);
if (atom->u.objectname.length < MINIMUM_ABBREV) if (atom->u.objectname.length < MINIMUM_ABBREV)
atom->u.objectname.length = MINIMUM_ABBREV; atom->u.objectname.length = MINIMUM_ABBREV;
} else } else
return strbuf_addf_ret(err, -1, _("unrecognized %%(objectname) argument: %s"), arg); return strbuf_addf_ret(err, -1, _("unrecognized argument '%s' in %%(%s)"), arg, atom->name);
return 0; return 0;
} }