Merge branch 'master' into next

diff --git a/git-add.sh b/git-add.sh
index 4bf41281d5554f9b1da103b0360eebc411a435eb..d6a4bc7d092f619d3c9dd20507c6659e13f82a3c 100755 (executable)
--- a/git-add.sh
+++ b/git-add.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+USAGE='[-n] [-v] <file>...'
+SUBDIRECTORY_OK='Yes'
+. git-sh-setup
+
 show_only=
 verbose=
 while : ; do
@@ -10,6 +14,13 @@ while : ; do
     -v)
        verbose=--verbose
        ;;
+    --)
+       shift
+       break
+       ;;
+    -*)
+       usage
+       ;;
     *)
        break
        ;;
@@ -17,7 +28,16 @@ while : ; do
   shift
 done
 
-GIT_DIR=$(git-rev-parse --git-dir) || exit
+# Check misspelled pathspec
+case "$#" in
+0)     ;;
+*)
+       git-ls-files --error-unmatch --others --cached -- "$@" >/dev/null || {
+               echo >&2 "Maybe you misspelled it?"
+               exit 1
+       }
+       ;;
+esac
 
 if test -f "$GIT_DIR/info/exclude"
 then