chiark / gitweb /
jenkins-build-makebuildserver: make sure fdroiddata is on master
authorHans-Christoph Steiner <hans@eds.org>
Mon, 14 Mar 2016 08:35:23 +0000 (09:35 +0100)
committerHans-Christoph Steiner <hans@eds.org>
Mon, 14 Mar 2016 08:35:23 +0000 (09:35 +0100)
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 <remote> <branch>

jenkins-build-makebuildserver

index 193718b2fe7750c40ae72bd38082143f856bdb4d..36df83afe7fe7d290b5ed904503855c53944bd33 100755 (executable)
@@ -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