summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-26 21:37:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-26 21:37:19 (GMT)
commit225caa73f25f8577a710f406b2670c3bcf0aef34 (patch)
treefac492640e0f0fcbfe621ebd91b40a34c5bbbcb6 /compat
parent56d4e7e6c347f8986a6621ca89ae3eec055bcf59 (diff)
parent3d1806487af395fb33d1de92633e96571b296305 (diff)
downloadgit-225caa73f25f8577a710f406b2670c3bcf0aef34.zip
git-225caa73f25f8577a710f406b2670c3bcf0aef34.tar.gz
git-225caa73f25f8577a710f406b2670c3bcf0aef34.tar.bz2
Merge branch 'ps/config-error'
Many codepaths forget to check return value from git_config_set(); the function is made to die() to make sure we do not proceed when setting a configuration variable failed. * ps/config-error: config: rename git_config_set_or_die to git_config_set config: rename git_config_set to git_config_set_gently compat: die when unable to set core.precomposeunicode sequencer: die on config error when saving replay opts init-db: die on config errors when initializing empty repo clone: die on config error in cmd_clone remote: die on config error when manipulating remotes remote: die on config error when setting/adding branches remote: die on config error when setting URL submodule--helper: die on config error when cloning module submodule: die on config error when linking modules branch: die on config error when editing branch description branch: die on config error when unsetting upstream branch: report errors in tracking branch setup config: introduce set_or_die wrappers
Diffstat (limited to 'compat')
-rw-r--r--compat/precompose_utf8.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c
index 079070f..dfbe6d8 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("core.precomposeunicode",
+ precomposed_unicode ? "true" : "false");
git_path_buf(&path, "%s", auml_nfc);
if (unlink(path.buf))
die_errno(_("failed to unlink '%s'"), path.buf);