From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 10 Feb 2017 11:45:04 +0000 (+0100)
Subject: jenkins-build-makebuildserver: handle git update of fdroiddata better
X-Git-Tag: 0.8~127^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3046156a89199fd6b895cee059e0386fac28eb67;p=fdroidserver.git

jenkins-build-makebuildserver: handle git update of fdroiddata better

This prevents attempts to merge when there was rebasing, which can fail.
---

diff --git a/jenkins-build-makebuildserver b/jenkins-build-makebuildserver
index 12145a2f..d151968b 100755
--- a/jenkins-build-makebuildserver
+++ b/jenkins-build-makebuildserver
@@ -54,8 +54,9 @@ 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 remote update -p
     git checkout master
-    git pull
+    git reset --hard origin/master
     cd ..
 else
     git clone --depth 1 https://gitlab.com/fdroid/fdroiddata.git fdroiddata