From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 May 2016 21:54:35 +0000 (-0700)
Subject: Merge branch 'ar/diff-args-osx-precompose'
X-Git-Tag: v2.9.0-rc0~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/53c4b3ed0e4c43fcd95473733b61e560ee21b4bc?ds=inline;hp=--cc

Merge branch 'ar/diff-args-osx-precompose'

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
---

53c4b3ed0e4c43fcd95473733b61e560ee21b4bc
diff --cc builtin/diff.c
index 343c6b8f25,5b8039cbc7..b7a9405d9f
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@@ -318,8 -318,8 +318,9 @@@ int cmd_diff(int argc, const char **arg
  
  	if (!no_index)
  		gitmodules_config();
 +	init_diff_ui_defaults();
  	git_config(git_diff_ui_config, NULL);
+ 	precompose_argv(argc, argv);
  
  	init_revisions(&rev, prefix);