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-tree.c | |
| parent | More topics for 2.8.4 (diff) | |
| parent | diff: run arguments through precompose_argv (diff) | |
| download | tgif-05781d37fa43b5dada77d1bcfd4cdc42742e7421.tar.xz | |
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-tree.c')
| -rw-r--r-- | builtin/diff-tree.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index 2a12b81e06..806dd7a885 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -114,6 +114,8 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) opt->disable_stdin = 1; memset(&s_r_opt, 0, sizeof(s_r_opt)); s_r_opt.tweak = diff_tree_tweak_rev; + + precompose_argv(argc, argv); argc = setup_revisions(argc, argv, opt, &s_r_opt); while (--argc > 0) { |