[PATCH v3 3/9] ref-filter: modify error messages in `grab_objectname()`
- From
- Hariom Verma via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Aug 17, 2020, 18:10 UTC
- Message-ID
- <4a12ff821020ceab5195e406461e00cecbb8e1fb.1597687822.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.684.v3.git.1597687822.gitgitgadget@gmail.com>
From: Hariom Verma <hariom18599@gmail.com>
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> --- ref-filter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c index 9bf92db6df..4f4591cad0 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -372,11 +372,11 @@ static int objectname_atom_parser(const struct ref_format *format, struct used_a atom->u.objectname.option = O_LENGTH; if (strtoul_ui(arg, 10, &atom->u.objectname.length) || 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) atom->u.objectname.length = MINIMUM_ABBREV; } 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; }
-- gitgitgadget