Better tattoo.

[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 8a5711d..c62391d 100644 (file)
--- a/tests/t2102-server-update-stable-candidate.sh
+++ b/tests/t2102-server-update-stable-candidate.sh
@@ -82,13 +82,30 @@ test_expect_success 'topic1 cannot be changed' '
        # It is already changed but error message should chagne
        git checkout topic1 &&
        ! git push origin topic1 2>push.err &&
-       cat push.err | grep "topic1 has been merged into stable"
+       cat push.err | grep "topic1 has been merged into stable" &&
+       git reset --hard HEAD^
 '
 
 test_expect_success 'topic3 cannot initially be created on stable' '
        git checkout -b topic3 stable &&
        ! git push origin topic3 2>push.err &&
-       cat push.err | grep "Creating a branch must include new commits"
+       cat push.err | grep "Creating a branch must include new commits" &&
+
+       echo "$test_name" >a.topic3 &&
+       git add a.topic3 &&
+       git commit -m "$test_name" &&
+       git push origin topic3
+'
+
+test_expect_success '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