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

Always try to recover origin/HEAD in case it's not there

Browse source
This commit is contained in:
Daniel Martí 2014-06-26 13:03:51 +02:00
parent 4ad7e8be06
commit e49b7aafda
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fdroidserver/common.py
View file

@ -435,6 +435,10 @@ class vcs_git(vcs):
p = SilentPopen(['git', 'fetch', '--prune', '--tags', 'origin'], cwd=self.local) p = SilentPopen(['git', 'fetch', '--prune', '--tags', 'origin'], cwd=self.local)
if p.returncode != 0: if p.returncode != 0:
raise VCSException("Git fetch failed") raise VCSException("Git fetch failed")
# Recreate origin/HEAD as git clone would do it, in case it disappeared
p = SilentPopen(['git', 'remote', 'set-head', 'origin', '--auto'], cwd=self.local)
if p.returncode != 0:
raise VCSException("Git remote set-head failed")
self.refreshed = True self.refreshed = True
# origin/HEAD is the HEAD of the remote, e.g. the "default branch" on # origin/HEAD is the HEAD of the remote, e.g. the "default branch" on
# a github repo. Most of the time this is the same as origin/master. # a github repo. Most of the time this is the same as origin/master.