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

Merge branch 'prune' into 'master'

Browse source 
Prune origin before fetch

See merge request fdroid/fdroidserver!1494
This commit is contained in:
Jochen Sprickerhof 2024-07-10 08:09:24 +00:00
commit 59f353e119
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fdroidserver/common.py
View file

@ -1390,12 +1390,9 @@ class vcs_git(vcs):
raise VCSException(_("Git clean failed"), p.output) raise VCSException(_("Git clean failed"), p.output)
if not self.refreshed: if not self.refreshed:
# Get latest commits and tags from remote # Get latest commits and tags from remote
p = self.git(['fetch', 'origin'], cwd=self.local) p = self.git(['fetch', '--prune', '--prune-tags', '--force', 'origin'], cwd=self.local)
if p.returncode != 0: if p.returncode != 0:
raise VCSException(_("Git fetch failed"), p.output) raise VCSException(_("Git fetch failed"), p.output)
p = self.git(['remote', 'prune', 'origin'], output=False, cwd=self.local)
if p.returncode != 0:
raise VCSException(_("Git prune failed"), p.output)
p = self.git(['fetch', '--prune', '--tags', '--force', 'origin'], output=False, cwd=self.local) p = self.git(['fetch', '--prune', '--tags', '--force', 'origin'], output=False, cwd=self.local)
if p.returncode != 0: if p.returncode != 0:
raise VCSException(_("Git fetch failed"), p.output) raise VCSException(_("Git fetch failed"), p.output)