Get tests passing again.

[git-central.git] / tests / t5000-checkout.sh

diff --git a/tests/t5000-checkout.sh b/tests/t5000-checkout.sh
index c9ce960..999bc26 100644 (file)
--- a/tests/t5000-checkout.sh
+++ b/tests/t5000-checkout.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 test_description='script checkout'
 
@@ -10,29 +10,31 @@ test_expect_success 'setup' '
        echo "setup" >a &&
        git add a &&
        git commit -m "setup" &&
-       git clone ./. server &&
-       rm -fr server/.git/hooks &&
-       git remote add origin ./server
+       git clone -l . --bare server.git &&
+       rm -fr server.git/hooks &&
+       git remote add origin ./server.git
        git checkout -b stable &&
        git push origin stable
 '
 
 test_expect_success 'checkout a new branch clones stable' '
-       gc-checkout topic1 &&
+       checkout topic1 &&
        git branch | grep topic1 &&
        git branch -r | grep origin/topic1 &&
        git config --list | grep "branch.topic1.merge=refs/heads/topic1"
 '
 
 test_expect_success 'checkout an existing remote branch' '
-       cd server &&
-       git checkout -b topic2 stable &&
+       git clone server.git person2 &&
+       cd person2 &&
+       git checkout -b topic2 origin/stable &&
        echo "$test_name on server" >a &&
        git commit -a -m "Made topic2 on server" &&
+       git push origin topic2
        cd .. &&
 
        ! git branch | grep topic2 &&
-       gc-checkout topic2 &&
+       checkout topic2 &&
        git branch | grep topic2 &&
        git branch -r | grep origin/topic2 &&
        git config --list | grep "branch.topic2.merge=refs/heads/topic2" &&
@@ -43,7 +45,7 @@ test_expect_success 'checkout an existing remote branch' '
 '
 
 test_expect_success 'checkout an existing local branch' '
-       gc-checkout topic1
+       checkout topic1
 '
 
 test_expect_success 'checkout a revision does not create a new branch' '
@@ -51,7 +53,7 @@ test_expect_success 'checkout a revision does not create a new branch' '
        git commit -a -m "$test_name" &&
 
        prior=$(git rev-parse HEAD^) &&
-       gc-checkout $prior &&
+       checkout $prior &&
        git branch | grep "no branch"
 '