Merge branch 'tb/sanitize-decomposed-utf-8-pathname'
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Jul 2012 22:37:51 +0000 (15:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Jul 2012 22:37:51 +0000 (15:37 -0700)
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

1  2 
Documentation/config.txt
Makefile
cache.h
config.c

Simple merge
diff --cc Makefile
Simple merge
diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge