commit 1bb799824e575b768c51d3175601ff7d4b9daf37
author Paladox none <thomasmulhall410@yahoo.com> Sat Mar 18 15:35:48 2017 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> Sat Mar 18 22:14:41 2017 +0000
tree 70b2d6a96a4136c28c27642fd3b6cf3fddbe9784
parent 7953fe154fe14d2fe388710fa8d7043498b9000c

Make gitblit build the master branch instead of pull

Reason is the pull was merged so no longer need to pin to it.

Change-Id: Id4fcb50261e01aba9c3f0e0fe4b9f58cde64ea05

jenkins/gitblit-ant-build.sh

diff --git a/jenkins/gitblit-ant-build.sh b/jenkins/gitblit-ant-build.sh
index a7453cc..5e0f087 100755
--- a/jenkins/gitblit-ant-build.sh
+++ b/jenkins/gitblit-ant-build.sh
@@ -15,13 +15,4 @@
 fi
 
 git fetch gitblit $GITBLIT_REF && git checkout FETCH_HEAD
-
-# Apply PR#1168 for Lucene compatibility with Gerrit master
-if [ "$GITBLIT_REF" == "refs/heads/master" ]
-then
-  git config user.name "Gerrit CI"
-  git config user.email "jenkins@gerritforge.com"
-  git fetch gitblit refs/pull/1168/head && git merge --no-edit FETCH_HEAD
-fi
-
 ant -DresourceFolderPrefix=static installMaven