From: Hans-Christoph Steiner <hans@eds.org>
Date: Sat, 8 Jul 2017 10:11:42 +0000 (+0200)
Subject: update: force checkout .gitlab-ci.yml when updating git mirrors
X-Git-Tag: 0.8~9^2~12
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d8954fc033daa437f8a3882f1c163da2aa51e2d8;p=fdroidserver.git

update: force checkout .gitlab-ci.yml when updating git mirrors

closes #309
---

diff --git a/fdroidserver/server.py b/fdroidserver/server.py
index ebfea3a3..0af5288d 100644
--- a/fdroidserver/server.py
+++ b/fdroidserver/server.py
@@ -393,7 +393,7 @@ def update_servergitmirrors(servergitmirrors, repo_section):
             if remote.name == 'gitlab':
                 logging.debug('Removing .gitlab-ci.yml now that it has successfully deployed')
                 repo.index.reset('HEAD^')
-                repo.index.checkout()
+                repo.index.checkout(force=True)
 
         if progress:
             bar.done()