Merge branch 'only_branches_and_tags'

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index 7bf9f2f5873ab2c71c5ca1b3995af0ae4da3eb42..efd2815ef18f455ee790a50b4eafb3f1571c1769 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -777,7 +777,7 @@ get_spec() {
        fi
 
        if [ -n "$CVSTAG" ]; then
-               git checkout "$CVSTAG" -- || exit
+               git checkout "$CVSTAG" -- 2>/dev/null || git checkout -t "origin/$CVSTAG" > /dev/null || exit
                git symbolic-ref -q HEAD > /dev/null &&
                        git merge '@{u}'
                if [ -n "$CVSDATE" ]; then