From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 27 May 2013 13:00:35 +0000 (+0200)
Subject: branches= on git-svn + muliple arguments allowed
X-Git-Tag: 0.1~558^2~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d042a685ce5ff61a11e33fcd7e3b3d4fd05c72db;p=fdroidserver.git

branches= on git-svn + muliple arguments allowed
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index ec9d7a98..914a900f 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -206,13 +206,11 @@ class vcs_gitsvn(vcs):
             if len(remote_split) > 1:
                 for i in remote_split[1:]:
                     if i.startswith('trunk='):
-                        trunk = i[6:]
+                        gitsvn_cmd += ['-T', i[6:]]
                     elif i.startswith('tags='):
-                        tags = i[5:]
-                if trunk:
-                    gitsvn_cmd += ['-T', trunk]
-                if tags:
-                    gitsvn_cmd += ['-t', tags]
+                        gitsvn_cmd += ['-t', i[5:]]
+                    elif i.startswith('branches='):
+                        gitsvn_cmd += ['-b', i[9:]]
                 if subprocess.call(gitsvn_cmd + [remote_split[0], self.local]) != 0:
                     raise VCSException("Git clone failed")
             else: