From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sun, 03 Apr 2022 14:39:43 GMT
Subject: Re: [PATCH v2 4/6] i18n: factorize "foo does not take arguments" messages
Message-ID: <220403.86sfqukz67.gmgdl@evledraar.gmail.com>
In-Reply-To: <6221c37145c22a79bc1598be1e82be50d61636cc.1648915853.git.gitgitgadget@gmail.com>


On Sat, Apr 02 2022, Jean-Noël Avila via GitGitGadget wrote:

> From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
>
> The messages are split into the ones for ref-filter which deal with
> atoms and scalar which has an option.

I see the git-for-each-ref manpage doesn't really refer to these
consistently, but I tihnk s/atom/format/g or s/atom/name/g would be lot
more obvious, especially in the context of how these are already
discussed in the manpage.

> @@ -317,7 +317,7 @@ static int objecttype_atom_parser(struct ref_format *format, struct used_atom *a
>  				  const char *arg, struct strbuf *err)
>  {
>  	if (arg)
> -		return strbuf_addf_ret(err, -1, _("%%(objecttype) does not take arguments"));
> +		return strbuf_addf_ret(err, -1, _("the atom '%s' does not take arguments"), "%(objecttype)");
>  	if (*atom->name == '*')
>  		oi_deref.info.typep = &oi_deref.type;
>  	else