Merge branch 'jc/add'
* jc/add: Detect misspelled pathspec to git-add ls-files --error-unmatch pathspec error reporting fix.maint
commit
abd54c2c39
11
git-add.sh
11
git-add.sh
|
@ -24,6 +24,17 @@ while : ; do
|
||||||
shift
|
shift
|
||||||
done
|
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"
|
if test -f "$GIT_DIR/info/exclude"
|
||||||
then
|
then
|
||||||
git-ls-files -z \
|
git-ls-files -z \
|
||||||
|
|
|
@ -777,7 +777,7 @@ int main(int argc, const char **argv)
|
||||||
if (ps_matched[num])
|
if (ps_matched[num])
|
||||||
continue;
|
continue;
|
||||||
error("pathspec '%s' did not match any.",
|
error("pathspec '%s' did not match any.",
|
||||||
pathspec[num] + prefix_len);
|
pathspec[num] + prefix_offset);
|
||||||
}
|
}
|
||||||
return errors ? 1 : 0;
|
return errors ? 1 : 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue