From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 9 Jul 2014 08:41:35 +0000 (+0200)
Subject: Support git-svn refs in the form of rN
X-Git-Tag: 0.2.1~23
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b404e1b69c5299d11590263b801134ad94ece206;p=fdroidserver.git

Support git-svn refs in the form of rN
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 3e241194..38c71509 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -646,7 +646,9 @@ class vcs_gitsvn(vcs):
                         treeish += 'master'
                         svn_rev = rev
 
-                    p = SilentPopen(['git', 'svn', 'find-rev', 'r' + svn_rev, treeish],
+                    svn_rev = svn_rev if svn_rev[0] == 'r' else 'r' + svn_rev
+
+                    p = SilentPopen(['git', 'svn', 'find-rev', svn_rev, treeish],
                                     cwd=self.local)
                     git_rev = p.output.rstrip()