chiark / gitweb /
update: force checkout .gitlab-ci.yml when updating git mirrors
authorHans-Christoph Steiner <hans@eds.org>
Sat, 8 Jul 2017 10:11:42 +0000 (12:11 +0200)
committerHans-Christoph Steiner <hans@eds.org>
Mon, 17 Jul 2017 09:38:15 +0000 (11:38 +0200)
closes #309

fdroidserver/server.py

index ebfea3a37876d311cb24e03291422649577dffad..0af5288d7d2b84217c49aae1d02220563c7d01dd 100644 (file)
@@ -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()