chiark / gitweb /
Support git-svn refs in the form of rN
authorDaniel Martí <mvdan@mvdan.cc>
Wed, 9 Jul 2014 08:41:35 +0000 (10:41 +0200)
committerDaniel Martí <mvdan@mvdan.cc>
Wed, 9 Jul 2014 08:41:35 +0000 (10:41 +0200)
fdroidserver/common.py

index 3e241194e3f1785e6f919921211735b3b339b08e..38c71509b723b213d1b1bee8ca2cde92792542d1 100644 (file)
@@ -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()