mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-09-16 16:02:33 +03:00
git-svn: use 'origin/' when passing a treeish (branches) to find-rev
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:
parent
6dd19063e9
commit
4ba9da0906
1 changed files with 2 additions and 2 deletions
|
@ -577,13 +577,13 @@ class vcs_gitsvn(vcs):
|
|||
# Translate svn rev into git format
|
||||
rev_split = rev.split('/')
|
||||
if len(rev_split) > 1:
|
||||
treeish = rev_split[0]
|
||||
treeish = 'origin/' + rev_split[0]
|
||||
svn_rev = rev_split[1]
|
||||
|
||||
else:
|
||||
# if no branch is specified, then assume trunk (ie. 'master'
|
||||
# branch):
|
||||
treeish = 'master'
|
||||
treeish = 'origin/master'
|
||||
svn_rev = rev
|
||||
|
||||
p = SilentPopen(['git', 'svn', 'find-rev', 'r' + svn_rev, treeish], cwd=self.local)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue