On Thu, Jul 19, 2018 at 8:18 PM Junio C Hamano <gits...@pobox.com> wrote:
> > --- a/config.c
> > +++ b/config.c
> > @@ -461,7 +461,7 @@ int git_config_from_parameters(config_fn_t fn, void
> > *data)
> > envw = xstrdup(env);
> >
> > if (sq_dequote_to_argv(envw, &argv, &nr, &alloc) < 0) {
> > - ret = error("bogus format in " CONFIG_DATA_ENVIRONMENT);
> > + ret = error("bogus format in %s", CONFIG_DATA_ENVIRONMENT);
> > goto out;
> > }
> >
>
> Good job spotting that the original wanted to say, but failed to
> say, that CONFIG_DATA_ENVIRONMENT as the source of broken data we
> detected. But I am not sure CONFIG_DATA_ENVIRONMENT is what we want
> to report as the source of bad data to the end users. One-shot
> configuration we get form "git -c VAR=VAL" are placed in the
> environment as an internal implementation detail, so from their
> point of view, the place we saw broken data coming from is their
> command line "git -c VAR=VAL" one-shot configuration.
I think I'll leave this one out for future follow up. The change here
is needed because otherwise we can't wrap the string in _(). This
patch, as you noted, is already big and getting more complicated than
it should be.
--
Duy
