X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-checkout-script;h=b31ded716d470a4975512ebc4cb912b3adb5fb7f;hb=2ab141a26f93c4d97e243a6be8a38a7dd4eb35a3;hp=a37740713ed747a18b7ee5415e41e5bd57834c48;hpb=379955c696a417f0fb6118f2fd91dbffd2816ad1;p=git.git

diff --git a/git-checkout-script b/git-checkout-script
index a3774071..b31ded71 100755
--- a/git-checkout-script
+++ b/git-checkout-script
@@ -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