From 3046156a89199fd6b895cee059e0386fac28eb67 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 10 Feb 2017 12:45:04 +0100 Subject: [PATCH] jenkins-build-makebuildserver: handle git update of fdroiddata better This prevents attempts to merge when there was rebasing, which can fail. --- jenkins-build-makebuildserver | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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