Merge branch 'nd/magic-pathspec'

"git diff -- ':(icase)makefile'" were rejected unnecessarily.
This needs to be merged to 'maint' later.

* nd/magic-pathspec:
diff: restrict pathspec limitations to diff b/f case only

diff --cc builtin/diff.c
Simple merge