From 3403402fbcb48d299cf52a9037f46563727ea9fd Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 23 Dec 2019 14:48:52 +0100 Subject: [PATCH] git force fetch tags The behaviour of fetching tags changed in git 2.20. We need to force fetch tags to restore the earlier behaviour and make fdroid git operations work with newer git versions. Closes fdroid/fdroidserver#718 --- fdroidserver/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 00dcb7c8..05060658 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -906,7 +906,7 @@ class vcs_git(vcs): p = self.git(['fetch', 'origin'], cwd=self.local) if p.returncode != 0: raise VCSException(_("Git fetch failed"), p.output) - p = self.git(['fetch', '--prune', '--tags', 'origin'], output=False, cwd=self.local) + p = self.git(['fetch', '--prune', '--tags', '--force', 'origin'], output=False, cwd=self.local) if p.returncode != 0: raise VCSException(_("Git fetch failed"), p.output) # Recreate origin/HEAD as git clone would do it, in case it disappeared