X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-checkout.sh;h=580a9e8a233f0a94c84792eba7c3dc653fccf3a0;hb=6fe5b7ff6cafcc94415deba2f3d611770d8e6b1e;hp=77c25938091b75f51eb3cc5922d67db6333e1e74;hpb=c3e160886214c3e7d1e939918900c56e0d1aca56;p=git.git

diff --git a/git-checkout.sh b/git-checkout.sh
index 77c259380..580a9e8a2 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -67,6 +67,10 @@ while [ "$#" != "0" ]; do
 			set x "$arg" "$@"
 			shift
 		fi
+		case "$1" in
+		--)
+			shift ;;
+		esac
 		break
 		;;
     esac
@@ -150,8 +154,7 @@ else
 	# Match the index to the working tree, and do a three-way.
     	git diff-files --name-only | git update-index --remove --stdin &&
 	work=`git write-tree` &&
-	git read-tree --reset $new &&
-	git checkout-index -f -u -q -a &&
+	git read-tree --reset -u $new &&
 	git read-tree -m -u --aggressive $old $new $work || exit
 
 	if result=`git write-tree 2>/dev/null`