X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-checkout.sh;h=580a9e8a233f0a94c84792eba7c3dc653fccf3a0;hb=68d42c41ef33cde500307660bb64a1c74f62711e;hp=360aabf9e35121ef83128d6731df189839efbe05;hpb=f54c76f1616cf470ce4bce8eff749272e1c6548c;p=git.git

diff --git a/git-checkout.sh b/git-checkout.sh
index 360aabf9e..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
@@ -137,8 +141,7 @@ fi
 
 if [ "$force" ]
 then
-    git-read-tree --reset $new &&
-	git-checkout-index -q -f -u -a
+    git-read-tree --reset -u $new
 else
     git-update-index --refresh >/dev/null
     merge_error=$(git-read-tree -m -u $old $new 2>&1) || (
@@ -151,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`
@@ -197,8 +199,8 @@ fi
 if [ "$?" -eq 0 ]; then
 	if [ "$newbranch" ]; then
 		if [ "$newbranch_log" ]; then
-			mkdir -p $(dirname "$GIT_DIR/logs/refs/heads/$branchname")
-			touch "$GIT_DIR/logs/refs/heads/$branchname"
+			mkdir -p $(dirname "$GIT_DIR/logs/refs/heads/$newbranch")
+			touch "$GIT_DIR/logs/refs/heads/$newbranch"
 		fi
 		git-update-ref -m "checkout: Created from $new_name" "refs/heads/$newbranch" $new || exit
 		branch="$newbranch"