From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 26 Jul 2013 14:51:47 +0000 (+0200)
Subject: also pull in changes from origin
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=9546f9a6c5f69a5546ebad79f0676f58bba42adc;p=profitbricks%2Fjenkins-build-scripts.git

also pull in changes from origin
---

diff --git a/maven_pre_build_debian_wrapper.sh b/maven_pre_build_debian_wrapper.sh
index 7eb6426..436ffc5 100755
--- a/maven_pre_build_debian_wrapper.sh
+++ b/maven_pre_build_debian_wrapper.sh
@@ -26,7 +26,9 @@ if [ ${GIT_BRANCH_NAME:0:8} = "feature/" ] || [ ${GIT_BRANCH_NAME:0:7} = "bugfix
 		#
 		echo "Switching to integration branch..."
 		git checkout integration
+		git pull origin integration
 		echo "Trying to fast-forward merge $GIT_BRANCH_NAME..."
+		git fetch origin -fp
 		git merge --no-ff origin/$GIT_BRANCH_NAME
 	fi
 elif [ "$GIT_BRANCH_NAME" = "master" ] || [ "${GIT_BRANCH_NAME:0:7}" = "hotfix/" ] ; then