From: Szymon Bochniak <szymon.bochniak@profitbricks.com>
Date: Tue, 30 Jul 2013 15:04:35 +0000 (+0200)
Subject: Reset local integration branch before merging with the branch to be built
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=09870b9ef4539bc3cd7628ebf9f071291b7ef99d;p=profitbricks%2Fjenkins-build-scripts.git

Reset local integration branch before merging with the branch to be built
---

diff --git a/.gitignore b/.gitignore
index 3220327..2b76de4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 */*\.pyc
 *\.pyc
 Packages*
+.idea
diff --git a/maven_pre_build_debian_wrapper.sh b/maven_pre_build_debian_wrapper.sh
index 93445e5..0978b01 100755
--- a/maven_pre_build_debian_wrapper.sh
+++ b/maven_pre_build_debian_wrapper.sh
@@ -36,9 +36,10 @@ if [[ ${GIT_BRANCH_NAME:0:8} = "feature/" ]] || [[ ${GIT_BRANCH_NAME:0:7} = "bug
         #
         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
+        echo "Fetching from remote..."
+        git fetch origin --prune
+        echo "Resetting integration branch to remote state..."
+        git reset --hard refs/remotes/origin/integration
         figlet "integration merge"
         git merge --no-ff origin/$GIT_BRANCH_NAME
     fi