diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-06-06 14:27:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-06 14:27:35 -0700 |
| commit | 05781d37fa43b5dada77d1bcfd4cdc42742e7421 (patch) | |
| tree | 671bb97f46944b084b878192bc3464bd5c13b1cb /builtin/diff-files.c | |
| parent | 4b0891ffe4ec3aef081cf48c5f9a747586076f7a (diff) | |
| parent | 90a78b83e0b812d1f42501a54372720def4ddd84 (diff) | |
| download | git-05781d37fa43b5dada77d1bcfd4cdc42742e7421.tar.gz | |
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-files.c')
| -rw-r--r-- | builtin/diff-files.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/diff-files.c b/builtin/diff-files.c index 8ed2eb8813..15c61fd8d1 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] == '-') { |