Allow tags to lag stable.

[git-central.git] / tests / t2700-server-ensure-follows.sh

diff --git a/tests/t2700-server-ensure-follows.sh b/tests/t2700-server-ensure-follows.sh
index 68a0052..b456525 100644 (file)
--- a/tests/t2700-server-ensure-follows.sh
+++ b/tests/t2700-server-ensure-follows.sh
@@ -45,7 +45,7 @@ test_expect_success 'branch with moved stable requires merge' '
        echo "$test_name" >a.topic1 &&
        git commit -a -m "Change on topic1." &&
        ! git push origin topic1 2>push.err &&
-       cat push.err | grep "You need to merge with stable" &&
+       cat push.err | grep "You need to merge stable into topic1" &&
 
        git merge stable &&
        git push origin topic1
@@ -65,11 +65,29 @@ test_expect_success 'branch with moved stable as second branch requires merge' '
        echo "$test_name" >a.topic1 &&
        git commit -a -m "Change on topic1." &&
        ! git push origin topic1 2>push.err &&
-       cat push.err | grep "You need to merge with stable" &&
+       cat push.err | grep "You need to merge stable into topic1" &&
 
        git merge stable &&
        git push origin topic1
 '
 
+test_expect_success 'tag with moved stable is okay' '
+       git checkout stable &&
+       echo "$test_name" >a &&
+       git commit -a -m "Change on stable" &&
+       git push origin stable &&
+
+       git checkout topic1 &&
+       git tag topic1-tag1
+       git push --tags
+'
+
+test_expect_success 'branch deletion with moved stable is okay' '
+       git checkout stable &&
+       echo "$test_name" >a &&
+       git commit -a -m "Change on stable" &&
+       git push origin :stable
+'
+
 test_done