Fix update-stable for 0-commit branches.

[git-central.git] / tests / t2102-server-update-stable-candidate.sh

diff --git a/tests/t2102-server-update-stable-candidate.sh b/tests/t2102-server-update-stable-candidate.sh
index cf891bf..b36dd1f 100644 (file)
--- a/tests/t2102-server-update-stable-candidate.sh
+++ b/tests/t2102-server-update-stable-candidate.sh
@@ -86,10 +86,9 @@ test_expect_success 'topic1 cannot be changed' '
        git reset --hard HEAD^
 '
 
-test_expect_success 'topic3 cannot initially be created on stable' '
+test_expect_success 'topic3 can initially be created on stable and then moved' '
        git checkout -b topic3 stable &&
-       ! git push origin topic3 2>push.err &&
-       cat push.err | grep "Creating a branch must include new commits" &&
+       git push origin topic3 &&
 
        echo "$test_name" >a.topic3 &&
        git add a.topic3 &&
@@ -97,16 +96,5 @@ test_expect_success 'topic3 cannot initially be created on stable' '
        git push origin topic3
 '
 
-test_expect_failure 'topic4 cannot point to the same place as topic4' '
-       git checkout -b topic4 topic3 &&
-       echo "$test_name" >a.topic4 &&
-       git add a.topic4 &&
-       git commit -m "making topic4" &&
-       git push origin topic4 &&
-
-       ! git push origin topic4:topic3 2>push.err &&
-       cat push.err | grep "topic3 is already referred to by topic4"
-'
-
 test_done