From ac83aa2e1fffcb4e7560431ddc15b288dc237634 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 5 Jul 2006 19:44:03 -0700 Subject: git-reset: complain and exit upon seeing an unknown parameter. The check to use "rev-parse --verify" was defeated by the use of "--default HEAD". "git reset --hard bogus-committish" just defaulted to reset to the HEAD without complaining. Signed-off-by: Junio C Hamano --- git-reset.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'git-reset.sh') diff --git a/git-reset.sh b/git-reset.sh index 46451d0d64..5c0224090a 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -17,7 +17,11 @@ case "$1" in usage ;; esac -rev=$(git-rev-parse --verify --default HEAD "$@") || exit +case $# in +0) rev=HEAD ;; +1) rev=$(git-rev-parse --verify "$1") || exit ;; +*) usage ;; +esac rev=$(git-rev-parse --verify $rev^0) || exit # We need to remember the set of paths that _could_ be left -- cgit v1.3 From dee4e384f376020e08cb78f6dfaf00ae84e97a9e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 27 Jul 2006 22:27:44 -0700 Subject: git-reset: detect update-ref error and report it. Signed-off-by: Junio C Hamano --- git-reset.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'git-reset.sh') diff --git a/git-reset.sh b/git-reset.sh index 5c0224090a..36fc8ce25b 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -52,7 +52,8 @@ then else rm -f "$GIT_DIR/ORIG_HEAD" fi -git-update-ref -m "reset $reset_type $@" HEAD "$rev" +git-update-ref -m "reset $reset_type $*" HEAD "$rev" +update_ref_status=$? case "$reset_type" in --hard ) @@ -66,3 +67,5 @@ case "$reset_type" in esac rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" "$GIT_DIR/SQUASH_MSG" + +exit $update_ref_status -- cgit v1.3