Browse Source

Merge branch 'jc/add'

* jc/add:
  Detect misspelled pathspec to git-add
  ls-files --error-unmatch pathspec error reporting fix.
maint
Junio C Hamano 19 years ago
parent
commit
abd54c2c39
  1. 11
      git-add.sh
  2. 2
      ls-files.c

11
git-add.sh

@ -24,6 +24,17 @@ while : ; do @@ -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 \

2
ls-files.c

@ -777,7 +777,7 @@ int main(int argc, const char **argv) @@ -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;
}

Loading…
Cancel
Save