Re: [PATCH v5 13/15] compat: die when unable to set core.precomposeunicode
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Feb 17, 2016, 10:34 UTC
- Message-ID
- <20160217103419.GA743@pks-xps.fritz.box>
- In-Reply-To
- <435511DD-0B0F-437F-974C-65C7265188A8@gmail.com>
On Wed, Feb 17, 2016 at 10:14:57AM +0100, Lars Schneider wrote:
Show 30 quoted lines
>
> On 16 Feb 2016, at 13:56, Patrick Steinhardt <ps@pks.im> wrote:
>
> > When calling `git_config_set` to set 'core.precomposeunicode' we
> > ignore the return value of the function, which may indicate that
> > we were unable to write the value back to disk. As the function
> > is only called by init-db we can and should die when an error
> > occurs.
> >
> > Signed-off-by: Patrick Steinhardt <ps@pks.im>
> > ---
> > compat/precompose_utf8.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c
> > index 079070f..9ff1ebe 100644
> > --- a/compat/precompose_utf8.c
> > +++ b/compat/precompose_utf8.c
> > @@ -50,7 +50,8 @@ void probe_utf8_pathname_composition(void)
> > close(output_fd);
> > git_path_buf(&path, "%s", auml_nfd);
> > precomposed_unicode = access(path.buf, R_OK) ? 0 : 1;
> > - git_config_set("core.precomposeunicode", precomposed_unicode ? "true" : "false");
> > + git_config_set_or_die("core.precomposeunicode",
> > + precomposed_unicode ? "true" : "false");
>
> I haven't been actively following this topic, so I don't know much about
> it. However, I just noticed that the topic might brake the OS X build?
>
> https://travis-ci.org/git/git/jobs/109752716 Thanks for the notice. Seems I've forgotten to switch that back to `git_config_set`. Didn't notice the breakage as the file is not required on my system.
Patrick