From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 23 Aug 2013 09:02:12 +0000 (+0200)
Subject: update+reset integration branch properly
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=cc1d877f21b586eb884696f0fec647902a25abdc;p=profitbricks%2Fjenkins-build-scripts.git

update+reset integration branch properly
---

diff --git a/maven_pre_build_debian_wrapper.sh b/maven_pre_build_debian_wrapper.sh
index 0978b01..9e9b603 100755
--- a/maven_pre_build_debian_wrapper.sh
+++ b/maven_pre_build_debian_wrapper.sh
@@ -51,5 +51,10 @@ elif [[ "$GIT_BRANCH_NAME" = "master" ]] || [[ "${GIT_BRANCH_NAME:0:7}" = "hotfi
     TAG=$(echo $VERSION | tr '~' '_' | tr ':' ',')
     git tag $TAG -m "Testing whether there is already a tag $TAG..."
     git tag -d $TAG
+elif [[ "$GIT_BRANCH_NAME" = "integration" ]] ; then
+        echo "Fetching from remote..."
+        git fetch origin --prune
+        echo "Resetting integration branch to remote state..."
+        git reset --hard refs/remotes/origin/integration
 fi