diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-13 15:37:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-13 15:37:51 -0700 |
| commit | b856ad623e4f686815986c0b9341dd1bfd791e71 (patch) | |
| tree | ddce49b4afdb7428c1cba49628020bd796704661 /git-compat-util.h | |
| parent | 6a9aa0c9b224517db0549d9252fdbc5177e6c0e2 (diff) | |
| parent | 76759c7dff53e8c84e975b88cb8245587c14c7ba (diff) | |
| download | git-b856ad623e4f686815986c0b9341dd1bfd791e71.tar.gz git-b856ad623e4f686815986c0b9341dd1bfd791e71.tar.xz | |
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 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 5bd9ad7d2..35b095e8a 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -153,6 +153,15 @@ #endif #endif +/* used on Mac OS X */ +#ifdef PRECOMPOSE_UNICODE +#include "compat/precompose_utf8.h" +#else +#define precompose_str(in,i_nfd2nfc) +#define precompose_argv(c,v) +#define probe_utf8_pathname_composition(a,b) +#endif + #ifndef NO_LIBGEN_H #include <libgen.h> #else |