git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Patrick Steinhardt <ps@pks.im>
To: Lars Schneider <larsxschneider@gmail.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
	Junio C Hamano <gitster@pobox.com>,
	Eric Sunshine <sunshine@sunshineco.com>,
	Stefan Beller <sbeller@google.com>
Subject: Re: [PATCH v5 13/15] compat: die when unable to set core.precomposeunicode
Date: Wed, 17 Feb 2016 11:34:19 +0100	[thread overview]
Message-ID: <20160217103419.GA743@pks-xps.fritz.box> (raw)
In-Reply-To: <435511DD-0B0F-437F-974C-65C7265188A8@gmail.com>

[-- Attachment #1: Type: text/plain, Size: 1544 bytes --]

On Wed, Feb 17, 2016 at 10:14:57AM +0100, Lars Schneider wrote:
> 
> 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

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

  reply	other threads:[~2016-02-17 10:34 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-16 12:56 [PATCH v5 00/15] config: make git_config_set die on failure Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 01/15] config: introduce set_or_die wrappers Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 02/15] branch: report errors in tracking branch setup Patrick Steinhardt
2016-02-16 23:07   ` Junio C Hamano
2016-02-17 10:34     ` Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 03/15] branch: die on config error when unsetting upstream Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 04/15] branch: die on config error when editing branch description Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 05/15] submodule: die on config error when linking modules Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 06/15] submodule--helper: die on config error when cloning module Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 07/15] remote: die on config error when setting URL Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 08/15] remote: die on config error when setting/adding branches Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 09/15] remote: die on config error when manipulating remotes Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 10/15] clone: die on config error in cmd_clone Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 11/15] init-db: die on config errors when initializing empty repo Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 12/15] sequencer: die on config error when saving replay opts Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 13/15] compat: die when unable to set core.precomposeunicode Patrick Steinhardt
2016-02-17  9:14   ` Lars Schneider
2016-02-17 10:34     ` Patrick Steinhardt [this message]
2016-02-16 12:56 ` [PATCH v5 14/15] config: rename git_config_set to git_config_set_gently Patrick Steinhardt
2016-02-16 12:56 ` [PATCH v5 15/15] config: rename git_config_set_or_die to git_config_set Patrick Steinhardt
2016-02-17 20:57   ` Michael Blume
2016-02-17 21:02     ` Michael Blume
2016-02-17 21:09       ` Junio C Hamano
2016-02-16 17:15 ` [PATCH v5 00/15] config: make git_config_set die on failure Eric Sunshine
2016-02-17 10:35   ` Patrick Steinhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160217103419.GA743@pks-xps.fritz.box \
    --to=ps@pks.im \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=larsxschneider@gmail.com \
    --cc=peff@peff.net \
    --cc=sbeller@google.com \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).