X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=git-checkout-script;h=b31ded716d470a4975512ebc4cb912b3adb5fb7f;hb=b893f09104ee5f1d8710dfe17cdf1cbac995f17a;hp=7e70338c476cfcf9ad51ce5d2a1f8e7ee93d705d;hpb=98e031f0bb6e857c684e6db24d03d22cfc1a532a;p=git.git

diff --git a/git-checkout-script b/git-checkout-script
index 7e70338c..b31ded71 100755
--- a/git-checkout-script
+++ b/git-checkout-script
@@ -22,7 +22,7 @@ while [ "$#" != "0" ]; do
 		force=1
 		;;
 	*)
-		rev=$(git-rev-parse --verify --revs-only "$arg^0") || exit
+		rev=$(git-rev-parse --verify "$arg^0") || exit
 		if [ -z "$rev" ]; then
 			echo "unknown flag $arg"
 			exit 1
@@ -37,7 +37,6 @@ while [ "$#" != "0" ]; do
 		fi
 		;;
     esac
-    i=$(($i+1))
 done
 [ -z "$new" ] && new=$old
 
@@ -72,4 +71,6 @@ if [ "$?" -eq 0 ]; then
 	fi
 	[ "$branch" ] && ln -sf "refs/heads/$branch" "$GIT_DIR/HEAD"
 	rm -f "$GIT_DIR/MERGE_HEAD"
+else
+	exit 1
 fi