Re: [PATCH v5 13/15] compat: die when unable to set core.precomposeunicode
- From
Lars Schneider <larsxschneider@gmail.com>
- Date
- Feb 17, 2016, 09:14 UTC
- Message-ID
- <435511DD-0B0F-437F-974C-65C7265188A8@gmail.com>
- In-Reply-To
- <1455627402-752-14-git-send-email-ps@pks.im>
On 16 Feb 2016, at 13:56, Patrick Steinhardt <ps@pks.im> wrote:
Show 22 quoted lines
> 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
Cheers, Lars
Show 10 quoted lines
> git_path_buf(&path, "%s", auml_nfc);
> if (unlink(path.buf))
> die_errno(_("failed to unlink '%s'"), path.buf);
> --
> 2.7.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html