From a09c4d7a7b2a90fffb767c2091a6df7aa37a98ea Mon Sep 17 00:00:00 2001 From: Pascal Giannakakis Date: Fri, 21 Mar 2014 17:00:29 +0100 Subject: [PATCH] - Fixed typos Task #PBP-6319 - Fix Jenkins pre- and post-commit triggers --- maven_pre_build_debian_wrapper.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maven_pre_build_debian_wrapper.sh b/maven_pre_build_debian_wrapper.sh index 4ef8e4a..136752c 100755 --- a/maven_pre_build_debian_wrapper.sh +++ b/maven_pre_build_debian_wrapper.sh @@ -17,6 +17,7 @@ cd $WORKSPACE [[ -d .repository ]] && rm .repository -rf && echo "$WORKSPACE/.repository (used by Maven) removed" # clean up git git reset --hard +git clean -xf # respect build-triggers (triggered from a git commit message containing the string [no-test]) if [[ "$BUILD_TRIGGERS" == *"no-test"* ]]; then export NO_TEST="true" @@ -30,6 +31,7 @@ figlet "$GIT_BRANCH_NAME" git checkout $GIT_BRANCH_NAME echo "Resetting $GIT_BRANCH_NAME branch to remote state..." git reset --hard refs/remotes/origin/$GIT_BRANCH_NAME +git clean -xf echo git status @@ -43,6 +45,7 @@ if [[ ${GIT_BRANCH_NAME:0:8} = "feature/" ]] || [[ ${GIT_BRANCH_NAME:0:7} = "bug git checkout integration echo "Resetting integration branch to remote state..." git reset --hard refs/remotes/origin/integration + git clean -xf figlet "integration merge" git merge --no-ff origin/$GIT_BRANCH_NAME fi -- 2.39.5