t/README: start testing porcelainish

[git.git] / git-checkout.sh

diff --git a/git-checkout.sh b/git-checkout.sh
index 360aabf9e35121ef83128d6731df189839efbe05..77c25938091b75f51eb3cc5922d67db6333e1e74 100755 (executable)
--- 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) || (
@@ -197,8 +196,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"