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

Use origin/HEAD as the default checkout for git

Browse source 
This should fix many RepoManifest UCMs where 'master' is not the default
branch
This commit is contained in:
Daniel Martí 2014-06-25 11:12:53 +02:00
parent c9638cf7dd
commit c0f026c9c4
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fdroidserver/common.py
View file

@ -436,8 +436,9 @@ class vcs_git(vcs):
if p.returncode != 0: if p.returncode != 0:
raise VCSException("Git fetch failed") raise VCSException("Git fetch failed")
self.refreshed = True self.refreshed = True
# Check out the appropriate revision # origin/HEAD is the HEAD of the remote, e.g. the "default branch" on
rev = str(rev if rev else 'origin/master') # a github repo. Most of the time this is the same as origin/master.
rev = str(rev if rev else 'origin/HEAD')
p = SilentPopen(['git', 'checkout', '-f', rev], cwd=self.local) p = SilentPopen(['git', 'checkout', '-f', rev], cwd=self.local)
if p.returncode != 0: if p.returncode != 0:
raise VCSException("Git checkout failed") raise VCSException("Git checkout failed")