Rewrite check if build is from correct branch

diff --git a/builder.sh b/builder.sh
index 9cdb3deb69ae8cdc09c64601de440d1a1a349032..04e97d94330a491f3c78482c10e3a358ae36e1c8 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -2349,8 +2349,8 @@ case "$COMMAND" in
                        TREE_PREFIX=$(echo "$TAG_PREFIX" | sed -e 's#^auto-\([a-zA-Z]\+\)-.*#\1#g')
                        if [ "$TREE_PREFIX" != "$TAG_PREFIX" ]; then
                                TAG_BRANCH="${TREE_PREFIX}-branch"
-                               TAG_STATUS=$($CVS_COMMAND status -v $SPECFILE | grep -Ei "${TAG_BRANCH}.+(branch: [0-9.]+)")
-                               if [ -n "$TAG_STATUS" -a "$CVSTAG" = "HEAD" ]; then
+                               TAG_STATUS=$(git branch -r | grep -i "origin/$TAG_BRANCH$" | sed 's# *origin/##')
+                               if [ -n "$TAG_STATUS" -a -z "$CVSTAG" ]; then
                                        Exit_error err_branch_exists "$TAG_STATUS"
                                fi
                        fi