Merge branch 'only_branches_and_tags'

diff --cc builder.sh
index 7bf9f2f5873ab2c71c5ca1b3995af0ae4da3eb42,2a200600b4f48c09f13ba64c2c981a4a76075a65..efd2815ef18f455ee790a50b4eafb3f1571c1769
--- 1/builder.sh
--- 2/builder.sh
+++ b/builder.sh
@@@ -777,12 -777,9 +777,12 @@@ 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
 +                      git checkout $(git rev-list -n1 --before="'$CVSDATE'" $CVSTAG) || exit 1
 +              fi
        fi
  
        if [ ! -f "$ASSUMED_NAME/$SPECFILE" ]; then