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 12145a2f915aa4b3da0611cdf710177950b82038..d151968b1390d80a88f11081b9ecaf56de2c733c 100755 (executable)
--- 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