summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-06 21:27:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-06 21:27:35 (GMT)
commit05781d37fa43b5dada77d1bcfd4cdc42742e7421 (patch)
tree671bb97f46944b084b878192bc3464bd5c13b1cb /builtin/diff.c
parent4b0891ffe4ec3aef081cf48c5f9a747586076f7a (diff)
parent90a78b83e0b812d1f42501a54372720def4ddd84 (diff)
downloadgit-05781d37fa43b5dada77d1bcfd4cdc42742e7421.zip
git-05781d37fa43b5dada77d1bcfd4cdc42742e7421.tar.gz
git-05781d37fa43b5dada77d1bcfd4cdc42742e7421.tar.bz2
Merge branch 'ar/diff-args-osx-precompose' into maint
Many commands normalize command line arguments from NFD to NFC variant of UTF-8 on OSX, but commands in the "diff" family did not, causing "git diff $path" to complain that no such path is known to Git. They have been taught to do the normalization. * ar/diff-args-osx-precompose: diff: run arguments through precompose_argv
Diffstat (limited to 'builtin/diff.c')
-rw-r--r--builtin/diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/diff.c b/builtin/diff.c
index 52c98a9..d6b8f98 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -319,6 +319,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
if (!no_index)
gitmodules_config();
git_config(git_diff_ui_config, NULL);
+ precompose_argv(argc, argv);
init_revisions(&rev, prefix);