]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
update+reset integration branch properly
authorHolger Levsen <holger@layer-acht.org>
Fri, 23 Aug 2013 09:02:12 +0000 (11:02 +0200)
committerHolger Levsen <holger@layer-acht.org>
Fri, 23 Aug 2013 09:02:12 +0000 (11:02 +0200)
maven_pre_build_debian_wrapper.sh

index 0978b014bc42c451d1db3913daff8e391187c2c4..9e9b603f0d2633ac8c22e2be1f14e8caf09d578c 100755 (executable)
@@ -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