From b3e17309fa630067d3fe6ca1b739c11cd6ef1f88 Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Fri, 3 Sep 2021 11:31:25 +0200
Subject: [PATCH] [checkupdates] reset repo state

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ff4545dea..0612008766 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -166,9 +166,11 @@ checkupdates_runner:
     - echo "${CHECKUPDATES_SSH_DEPLOY_KEY}" | tr -d '\r' | ssh-add -
     - url_host=$(echo "${CI_REPOSITORY_URL}" | sed -e 's|https\?://gitlab-ci-token:.*@|ssh://git@|g')
     - git remote set-url --push origin "${url_host}"
-    # somehow there is an old rebase in the image
+    # reset repo to origin state before adding new commits
     - git rebase --abort || true
     - rm -fr ".git/rebase-apply"
+    - git checkout master || true
+    - git reset --hard origin/master || true
   script:
     - fdroid checkupdates --allow-dirty --auto --commit ${CHECKUPDATES_APPIDS} 2>&1 | tee /tmp/out || true
     - git pull --rebase origin master