From 0fef06a5c90d935cfc70084150cec9214ce19570 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 14 Mar 2016 09:35:23 +0100 Subject: [PATCH] jenkins-build-makebuildserver: make sure fdroiddata is on master on the GP jenkins, I got this: + git pull From https://gitlab.com/fdroid/fdroiddata 1df2d03..621ef4f master -> origin/master You are not currently on a branch. Please specify which branch you want to merge with. See git-pull(1) for details. git pull --- jenkins-build-makebuildserver | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins-build-makebuildserver b/jenkins-build-makebuildserver index 193718b2..36df83af 100755 --- a/jenkins-build-makebuildserver +++ b/jenkins-build-makebuildserver @@ -51,6 +51,7 @@ echo "apt_package_cache = True" >> $WORKSPACE/makebuildserver.config.py # this can be handled in the jenkins job, or here: if [ -e fdroiddata ]; then cd fdroiddata + git checkout master git pull cd .. else