From: Kacper Kornet <draenog@pld-linux.org>
Date: Wed, 5 Sep 2012 02:23:33 +0000 (+0200)
Subject: builder: Don't try to merge with upstream when --no-cvs-specs is specified
X-Git-Tag: auto/th/rpm-build-tools-4.5-7~19
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=2226518e06a5ffc98661d2b4b0573c5e5bfdc5e3;p=packages%2Frpm-build-tools.git

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

diff --git a/builder.sh b/builder.sh
index 2529aa8..3b9e03e 100755
--- 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