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:
Daniel Martí 2014-06-29 01:29:31 +02:00
parent 6dd19063e9
commit 4ba9da0906

View file

@ -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)