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

git-svn: use 'origin/' when passing a treeish (branches) to find-rev

Browse source 
This fixes the builds of de.blau.android. This worked before for some reason.
Git-svn probably changed in some way.
This commit is contained in:
Daniel Martí 2014-06-29 01:29:31 +02:00
parent 6dd19063e9
commit 4ba9da0906
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fdroidserver/common.py
View file

@ -577,13 +577,13 @@ class vcs_gitsvn(vcs):
# Translate svn rev into git format # Translate svn rev into git format
rev_split = rev.split('/') rev_split = rev.split('/')
if len(rev_split) > 1: if len(rev_split) > 1:
treeish = rev_split[0] treeish = 'origin/' + rev_split[0]
svn_rev = rev_split[1] svn_rev = rev_split[1]
else: else:
# if no branch is specified, then assume trunk (ie. 'master' # if no branch is specified, then assume trunk (ie. 'master'
# branch): # branch):
treeish = 'master' treeish = 'origin/master'
svn_rev = rev svn_rev = rev
p = SilentPopen(['git', 'svn', 'find-rev', 'r' + svn_rev, treeish], cwd=self.local) p = SilentPopen(['git', 'svn', 'find-rev', 'r' + svn_rev, treeish], cwd=self.local)