summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2016-02-22 12:23:36 +0100
committerJunio C Hamano <gitster@pobox.com>2016-02-22 10:23:55 -0800
commit3d1806487af395fb33d1de92633e96571b296305 (patch)
treec7bc07258511d11eaf29fc9be1386a42688dcbe8 /compat
parent30598ad06f2adfef1f74d6348677358865cbf373 (diff)
downloadgit-3d1806487af395fb33d1de92633e96571b296305.tar.gz
config: rename git_config_set_or_die to git_config_setps/config-error
Rename git_config_set_or_die functions to git_config_set, leading to the new default behavior of dying whenever a configuration error occurs. By now all callers that shall die on error have been transitioned to the _or_die variants, thus making this patch a simple rename of the functions. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
-rw-r--r--compat/precompose_utf8.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c
index 9ff1ebe02b..dfbe6d8408 100644
--- a/compat/precompose_utf8.c
+++ b/compat/precompose_utf8.c
@@ -50,8 +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_or_die("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);