From: Junio C Hamano Date: Mon, 6 Jun 2016 21:27:35 +0000 (-0700) Subject: Merge branch 'ar/diff-args-osx-precompose' into maint X-Git-Tag: v2.8.4~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05781d37fa43b5dada77d1bcfd4cdc42742e7421;p=thirdparty%2Fgit.git 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 --- 05781d37fa43b5dada77d1bcfd4cdc42742e7421