summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-13 22:37:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-13 22:37:51 (GMT)
commitb856ad623e4f686815986c0b9341dd1bfd791e71 (patch)
treeddce49b4afdb7428c1cba49628020bd796704661 /config.c
parent6a9aa0c9b224517db0549d9252fdbc5177e6c0e2 (diff)
parent76759c7dff53e8c84e975b88cb8245587c14c7ba (diff)
downloadgit-b856ad623e4f686815986c0b9341dd1bfd791e71.zip
git-b856ad623e4f686815986c0b9341dd1bfd791e71.tar.gz
git-b856ad623e4f686815986c0b9341dd1bfd791e71.tar.bz2
Merge branch 'tb/sanitize-decomposed-utf-8-pathname'
Teaches git to normalize pathnames read from readdir(3) and all arguments from the command line into precomposed UTF-8 (assuming that they come as decomposed UTF-8) to work around issues on Mac OS. I think there still are other places that need conversion (e.g. paths that are read from stdin for some commands), but this should be a good first step in the right direction. * tb/sanitize-decomposed-utf-8-pathname: git on Mac OS and precomposed unicode
Diffstat (limited to 'config.c')
-rw-r--r--config.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/config.c b/config.c
index d28a499..40818e8 100644
--- a/config.c
+++ b/config.c
@@ -758,6 +758,11 @@ static int git_default_core_config(const char *var, const char *value)
return 0;
}
+ if (!strcmp(var, "core.precomposeunicode")) {
+ precomposed_unicode = git_config_bool(var, value);
+ return 0;
+ }
+
/* Add other config variables here and to Documentation/config.txt. */
return 0;
}