builder: Don't try to merge with upstream when --no-cvs-specs is specified

diff --git a/builder.sh b/builder.sh
index 2529aa8765161744735845903a36e78e4d9b7e1d..3b9e03efd18ca557644bed889c989b90895492db 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -958,8 +958,8 @@ get_spec() {
                if [ $(git rev-parse "$CVSTAG") != $(git rev-parse HEAD) ]; then
                        Exit_error "err_no_checkut" "$CVSTAG"
                fi
-               git symbolic-ref -q HEAD > /dev/null &&
                        git merge '@{u}'
+               git symbolic-ref -q HEAD > /dev/null && [ "$NOCVSSPEC" != "yes" ] &&
                if [ -n "$CVSDATE" ]; then
                        git checkout $(git rev-list -n1 --before="'$CVSDATE'" $CVSTAG) || exit 1
                fi