Revision 90a78b83e0b812d1f42501a54372720def4ddd84 authored by Alexander Rinass on 13 May 2016, 20:41:02 UTC, committed by Junio C Hamano on 13 May 2016, 21:35:49 UTC
When running diff commands, a pathspec containing decomposed unicode code points is not converted to precomposed unicode form under Mac OS X, but we normalize the paths in the index and the history to precomposed form on that platform. As a result, the pathspec would not match and no diff is shown. Unlike many builtin commands, the "diff" family of commands do not use parse_options(), which is how other builtin commands indirectly call precompose_argv() to normalize argv[] into precomposed form on Mac OSX. Teach these commands to call precompose_argv() themselves. Note that precomopose_argv() normalizes not just paths but all command line arguments, so things like "git diff -G $string" when $string has the decomposed form would first be normalized into the precomposed form and would stop hitting the same string in the decomposed form in the diff output with this change. It is not a problem per-se, as "log" family of commands already use parse_options() and call precompose_argv()--we can think of this change as making the "diff" family of commands behave in a similar way as the commands in the "log" family. Signed-off-by: Alexander Rinass <alex@fournova.com> Helped-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 7654286
File | Mode | Size |
---|---|---|
xdiff.h | -rw-r--r-- | 3.6 KB |
xdiffi.c | -rw-r--r-- | 15.7 KB |
xdiffi.h | -rw-r--r-- | 2.0 KB |
xemit.c | -rw-r--r-- | 6.9 KB |
xemit.h | -rw-r--r-- | 1.2 KB |
xhistogram.c | -rw-r--r-- | 9.0 KB |
xinclude.h | -rw-r--r-- | 1.2 KB |
xmacros.h | -rw-r--r-- | 1.9 KB |
xmerge.c | -rw-r--r-- | 15.1 KB |
xpatience.c | -rw-r--r-- | 9.9 KB |
xprepare.c | -rw-r--r-- | 12.0 KB |
xprepare.h | -rw-r--r-- | 1.1 KB |
xtypes.h | -rw-r--r-- | 1.6 KB |
xutils.c | -rw-r--r-- | 11.0 KB |
xutils.h | -rw-r--r-- | 1.8 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...