merge with /dev/null as base, instead of punting O==empty case

diff --git a/git-add.sh b/git-add.sh
index a8498c729ab3188bd21dd6a54ddc77d4c34ac48a..b5fe46aa20865d6785390fd22406d32b00a77845 100755 (executable)
--- a/git-add.sh
+++ b/git-add.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+usage() {
+    die "usage: git add [-n] [-v] <file>..."
+}
+
 show_only=
 verbose=
 while : ; do
@@ -10,6 +14,9 @@ while : ; do
     -v)
        verbose=--verbose
        ;;
+    -*)
+       usage
+       ;;
     *)
        break
        ;;
@@ -23,10 +30,10 @@ if test -f "$GIT_DIR/info/exclude"
 then
        git-ls-files -z \
        --exclude-from="$GIT_DIR/info/exclude" \
-       --others --exclude-per-directory=.gitignore "$@"
+       --others --exclude-per-directory=.gitignore -- "$@"
 else
        git-ls-files -z \
-       --others --exclude-per-directory=.gitignore "$@"
+       --others --exclude-per-directory=.gitignore -- "$@"
 fi |
 case "$show_only" in
 true)