Merge branch 'cp/add-u-pathspec'

* cp/add-u-pathspec:
  test for add with non-existent pathspec
  git add -u: die on unmatched pathspec

diff --cc builtin/add.c
Simple merge