Merge branch 'jk/log-follow-with-non-literal-pathspec'

"git [-c log.follow=true] log [--follow] ':(glob)f**'" used to barf.

* jk/log-follow-with-non-literal-pathspec:
  diff: detect pathspec magic not supported by --follow
  diff: factor out --follow pathspec check
  pathspec: factor out magic-to-name function

diff --cc builtin/log.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc diff.h
Simple merge

diff --cc pathspec.c
Simple merge

diff --cc pathspec.h
Simple merge

diff --cc t/t4202-log.sh
Simple merge