From cc1d877f21b586eb884696f0fec647902a25abdc Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 23 Aug 2013 11:02:12 +0200 Subject: [PATCH] update+reset integration branch properly --- maven_pre_build_debian_wrapper.sh | 5 +++++ 1 file changed, 5 insertions(+) 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 -- 2.39.5