From: Ramsay Jones Date: Fri, 04 Mar 2016 18:49:42 GMT Subject: Re: git diff does not precompose unicode file paths (OS X) Message-ID: <56D9D8C6.2060104@ramsayjones.plus.com> In-Reply-To: On 04/03/16 14:37, Alexander Rinass wrote: > >> On 04 Mar 2016, at 13:16, Torsten Bögershausen wrote: >> >> On 03/04/2016 10:07 AM, Alexander Rinass wrote: [snip] > > Sticking a precompose_argv(argc, argv) into diff.c’s cmd_diff function fixes the issue. > > But I had to disable the check (precomposed_unicode != 1) in precompose_argv to make it work. That’s probably because precompose_argv is usually called from parse_options and is missing some other call before it? > Yes, you need to place it after the configuration is read, but before calls to diff_no_index() or setup_revisions(). Directly after the call to git_config() should be fine. [But this begs the question about other commands, including plumbing, which don't call parse_options().] Maybe this will work for you (I can't test it, since I don't have any access to a Mac): diff --git a/builtin/diff.c b/builtin/diff.c index 343c6b8..b7a9405 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -320,6 +320,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) gitmodules_config(); init_diff_ui_defaults(); git_config(git_diff_ui_config, NULL); + precompose_argv(argc, argv); init_revisions(&rev, prefix); ATB, Ramsay Jones