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 /Makefile | |
| 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 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -607,6 +607,7 @@ LIB_H += compat/bswap.h LIB_H += compat/cygwin.h LIB_H += compat/mingw.h LIB_H += compat/obstack.h +LIB_H += compat/precompose_utf8.h LIB_H += compat/terminal.h LIB_H += compat/win32/dirent.h LIB_H += compat/win32/poll.h @@ -1001,6 +1002,8 @@ ifeq ($(uname_S),Darwin) NO_MEMMEM = YesPlease USE_ST_TIMESPEC = YesPlease HAVE_DEV_TTY = YesPlease + COMPAT_OBJS += compat/precompose_utf8.o + BASIC_CFLAGS += -DPRECOMPOSE_UNICODE endif ifeq ($(uname_S),SunOS) NEEDS_SOCKET = YesPlease |