X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-checkout.sh;h=5613bfc403f7a4208d2a85de73ec33229e5a3f10;hb=cefda27f741a948a78ce27180f5332c2d19199c4;hp=564117f0064aba32e190a49106eaecfdb422b31e;hpb=f579d3c2b8f34844affbb355680adaa653606245;p=git.git

diff --git a/git-checkout.sh b/git-checkout.sh
index 564117f00..5613bfc40 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -137,8 +137,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 +150,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`