summaryrefslogtreecommitdiff
path: root/builtin/diff-files.c
diff options
context:
space:
mode:
authorAlexander Rinass <alex@fournova.com>2016-05-13 20:41:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-05-13 21:35:49 (GMT)
commit90a78b83e0b812d1f42501a54372720def4ddd84 (patch)
tree9e1d4ed51806d4643b3460c585381b1f971593cb /builtin/diff-files.c
parent765428699a5381f113d19974720bc91b5bfeaf1d (diff)
downloadgit-90a78b83e0b812d1f42501a54372720def4ddd84.zip
git-90a78b83e0b812d1f42501a54372720def4ddd84.tar.gz
git-90a78b83e0b812d1f42501a54372720def4ddd84.tar.bz2
diff: run arguments through precompose_argv
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>
Diffstat (limited to 'builtin/diff-files.c')
-rw-r--r--builtin/diff-files.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 8ed2eb8..15c61fd 100644
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -24,6 +24,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
gitmodules_config();
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
rev.abbrev = 0;
+ precompose_argv(argc, argv);
argc = setup_revisions(argc, argv, &rev, NULL);
while (1 < argc && argv[1][0] == '-') {