X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=server%2Fupdate-stable;h=b935dae079c9119680ebb22b4ced09219193d2dd;hb=0834ef8e0003fc9dd15a25da61220ab1852e8cf6;hp=c816750af5c70225d2ce307d66ca0eb878d37739;hpb=755a38971304938a8b0e16795894a2025479b597;p=git-central.git

diff --git a/server/update-stable b/server/update-stable
index c816750..b935dae 100644
--- 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