Merge branch 'cb/add-pathspec'

* cb/add-pathspec:
  remove pathspec_match, use match_pathspec instead
  clean up pathspec matching

diff --cc builtin-checkout.c
Simple merge

diff --cc builtin-commit.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc dir.c
Simple merge