X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-checkout.sh;h=e02c7afbaed52e83a01a68a65ff950b07c04f839;hb=b0d8923ec01fd91b75ab079034f89ced91500157;hp=4e7c57a5f39894c85a6b1f8f2e1eee444808c57f;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git

diff --git a/git-checkout.sh b/git-checkout.sh
index 4e7c57a5..e02c7afb 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -22,7 +22,8 @@ while [ "$#" != "0" ]; do
 		force=1
 		;;
 	*)
-		rev=$(git-rev-parse --verify "$arg^0") || exit
+		rev=$(git-rev-parse --verify "$arg^0" 2>/dev/null) ||
+			die "hey dummy, branch '$arg' doesn't exist."
 		if [ -z "$rev" ]; then
 			echo "unknown flag $arg"
 			exit 1
@@ -55,6 +56,7 @@ then
     git-read-tree --reset $new &&
 	git-checkout-index -q -f -u -a
 else
+    git-update-index --refresh >/dev/null
     git-read-tree -m -u $old $new
 fi