From d8954fc033daa437f8a3882f1c163da2aa51e2d8 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sat, 8 Jul 2017 12:11:42 +0200 Subject: [PATCH] update: force checkout .gitlab-ci.yml when updating git mirrors closes #309 --- fdroidserver/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() -- 2.30.2