Merge branch 'ar/diff-args-osx-precompose'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2016 21:54:35 +0000 (14:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2016 21:54:35 +0000 (14:54 -0700)
commit53c4b3ed0e4c43fcd95473733b61e560ee21b4bc
tree744a5242a62b998b58a1aa8702603cf47b6d76e2
parentfa4f29b8a8febd454fb589f96afa014d73f157c1
parent90a78b83e0b812d1f42501a54372720def4ddd84
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
builtin/diff-tree.c
builtin/diff.c