From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 28 Jun 2014 23:29:31 +0000 (+0200)
Subject: git-svn: use 'origin/' when passing a treeish (branches) to find-rev
X-Git-Tag: 0.2.1~91
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=4ba9da090632fd86a5eafb2cfd32f077f0e110c9;p=fdroidserver.git

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.
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 2c8b6795..79ac0b31 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -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)