mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'git_fetch_force_tags' into 'master'

Browse source 
git force fetch tags

Closes #718

See merge request fdroid/fdroidserver!699
This commit is contained in:
Hans-Christoph Steiner 2020-01-02 13:45:22 +00:00
commit 098bce2134
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/common.py
View file

@ -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