git-add--interactive: Improve behavior on bogus input

diff --git a/git-reset.sh b/git-reset.sh
index 91c7e6e664eeac0a130044d3d026ccbbfa00f3b3..bafeb52cd113ad8a07ffd1912191f2bc17a7ef7a 100755 (executable)
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -11,7 +11,7 @@ require_work_tree
 update= reset_type=--mixed
 unset rev
 
-while case $# in 0) break ;; esac
+while test $# != 0
 do
        case "$1" in
        --mixed | --soft | --hard)
@@ -24,7 +24,7 @@ do
                usage
                ;;
        *)
-               rev=$(git-rev-parse --verify "$1") || exit
+               rev=$(git rev-parse --verify "$1") || exit
                shift
                break
                ;;
@@ -33,7 +33,7 @@ do
 done
 
 : ${rev=HEAD}
-rev=$(git-rev-parse --verify $rev^0) || exit
+rev=$(git rev-parse --verify $rev^0) || exit
 
 # Skip -- in "git reset HEAD -- foo" and "git reset -- foo".
 case "$1" in --) shift ;; esac
@@ -43,10 +43,10 @@ case "$1" in --) shift ;; esac
 # affecting the working tree nor HEAD.
 if test $# != 0
 then
-       test "$reset_type" == "--mixed" ||
+       test "$reset_type" = "--mixed" ||
                die "Cannot do partial $reset_type reset."
 
-       git-diff-index --cached $rev -- "$@" |
+       git diff-index --cached $rev -- "$@" |
        sed -e 's/^:\([0-7][0-7]*\) [0-7][0-7]* \([0-9a-f][0-9a-f]*\) [0-9a-f][0-9a-f]* [A-Z]   \(.*\)$/\1 \2   \3/' |
        git update-index --add --remove --index-info || exit
        git update-index --refresh
@@ -66,28 +66,28 @@ fi
 if test "$reset_type" = "--soft"
 then
        if test -f "$GIT_DIR/MERGE_HEAD" ||
-          test "" != "$(git-ls-files --unmerged)"
+          test "" != "$(git ls-files --unmerged)"
        then
                die "Cannot do a soft reset in the middle of a merge."
        fi
 else
-       git-read-tree --reset $update "$rev" || exit
+       git read-tree -v --reset $update "$rev" || exit
 fi
 
 # Any resets update HEAD to the head being switched to.
-if orig=$(git-rev-parse --verify HEAD 2>/dev/null)
+if orig=$(git rev-parse --verify HEAD 2>/dev/null)
 then
        echo "$orig" >"$GIT_DIR/ORIG_HEAD"
 else
        rm -f "$GIT_DIR/ORIG_HEAD"
 fi
-git-update-ref -m "$GIT_REFLOG_ACTION" HEAD "$rev"
+git update-ref -m "$GIT_REFLOG_ACTION" HEAD "$rev"
 update_ref_status=$?
 
 case "$reset_type" in
 --hard )
        test $update_ref_status = 0 && {
-               echo -n "HEAD is now at "
+               printf "HEAD is now at "
                GIT_PAGER= git log --max-count=1 --pretty=oneline \
                        --abbrev-commit HEAD
        }
@@ -96,7 +96,7 @@ case "$reset_type" in
        ;; # Nothing else to do
 --mixed )
        # Report what has not been updated.
-       git-update-index --refresh
+       git update-index --refresh
        ;;
 esac