Merge branch 'jc/add'

* jc/add:
  Detect misspelled pathspec to git-add
  ls-files --error-unmatch pathspec error reporting fix.

diff --git a/git-add.sh b/git-add.sh
index f719b4b..13fad82 100755 (executable)
--- a/git-add.sh
+++ b/git-add.sh
@@ -24,6 +24,17 @@ while : ; do
   shift
 done
 
+# 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
        git-ls-files -z \

diff --git a/ls-files.c b/ls-files.c
index 52bbfdc..c533059 100644 (file)
--- a/ls-files.c
+++ b/ls-files.c
@@ -777,7 +777,7 @@ int main(int argc, const char **argv)
                        if (ps_matched[num])
                                continue;
                        error("pathspec '%s' did not match any.",
-                             pathspec[num] + prefix_len);
+                             pathspec[num] + prefix_offset);
                }
                return errors ? 1 : 0;
        }