summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorTorsten Bögershausen <tboegi@web.de>2013-08-27 15:50:40 +0200
committerJunio C Hamano <gitster@pobox.com>2013-08-27 07:41:32 -0700
commit92b0c8bed0d3f6ed5442e3ffa178413772faa31b (patch)
tree1bf170a02f29758568bb7534f3333a8411104a9b /compat
parente230c568c4b9a991e3175e5f65171a566fd8e39c (diff)
downloadgit-92b0c8bed0d3f6ed5442e3ffa178413772faa31b.tar.gz
Set core.precomposeunicode to true on e.g. HFS+tb/precompose-autodetect-fix
When core.precomposeunicode was introduced in 76759c7d, it was set to false on a unicode decomposing file system like HFS+ to be compatible with older versions of Git. The Mac OS users need to find out that this configuration exist and change it manually from false to true. A smoother workflow can be achieved, so set core.precomposeunicode to true on a decomposing file system. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
-rw-r--r--compat/precompose_utf8.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c
index 7980abd1a7..95fe849e42 100644
--- a/compat/precompose_utf8.c
+++ b/compat/precompose_utf8.c
@@ -48,11 +48,8 @@ void probe_utf8_pathname_composition(char *path, int len)
if (output_fd >= 0) {
close(output_fd);
strcpy(path + len, auml_nfd);
- /* Indicate to the user, that we can configure it to true */
- if (!access(path, R_OK))
- git_config_set("core.precomposeunicode", "false");
- /* To be backward compatible, set precomposed_unicode to 0 */
- precomposed_unicode = 0;
+ precomposed_unicode = access(path, R_OK) ? 0 : 1;
+ git_config_set("core.precomposeunicode", precomposed_unicode ? "true" : "false");
strcpy(path + len, auml_nfc);
if (unlink(path))
die_errno(_("failed to unlink '%s'"), path);