I'm not ready to enforce that all tips must be new quite yet.

diff --git a/server/update-stable b/server/update-stable
index c816750af5c70225d2ce307d66ca0eb878d37739..b935dae079c9119680ebb22b4ced09219193d2dd 100644 (file)
--- a/server/update-stable
+++ b/server/update-stable
@@ -81,17 +81,17 @@ if [ "$change_type" != "update" ] ; then
        exit 0
 fi
 
-# The tip must always be new
-already=$(git branch --contains "$newrev")
-if [ "$already" != "" ] ; then
-       already=${already##  }
-       echo "----------------------------------------------------"
-       echo
-       echo "$short_refname is already referred to by $already"
-       echo
-       echo "----------------------------------------------------"
-       exit 1
-fi
+# # The tip must always be new
+# already=$(git branch --contains "$newrev")
+# if [ "$already" != "" ] ; then
+#      already=${already##  }
+#      echo "----------------------------------------------------"
+#      echo
+#      echo "$short_refname is already referred to by $already"
+#      echo
+#      echo "----------------------------------------------------"
+#      exit 1
+#fi
 
 if [ "$short_refname" == "stable" ] ; then
        # Stable enforcement
@@ -162,7 +162,7 @@ else
        esac
 
        # Check if topic is already in candidates
-       candidate=$(git branch --contains "$oldrev" | grep -oP candidate.* --max-count=1)
+       candidate=$(git branch --contains "$oldrev" | grep -oP "candidate.*" --max-count=1)
        if [ $? -eq 0 ] ; then
                echo "----------------------------------------------------"
                echo

diff --git a/tests/t2102-server-update-stable-candidate.sh b/tests/t2102-server-update-stable-candidate.sh
index c62391d2e723cd41c453360d351e5c63708c1867..cf891bf12c092f59e310b5edfe980b92f4df65f5 100644 (file)
--- a/tests/t2102-server-update-stable-candidate.sh
+++ b/tests/t2102-server-update-stable-candidate.sh
@@ -97,7 +97,7 @@ test_expect_success 'topic3 cannot initially be created on stable' '
        git push origin topic3
 '
 
-test_expect_success 'topic4 cannot point to the same place as topic4' '
+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 &&