From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 28 May 2013 14:36:52 +0000 (+0200)
Subject: Forgot to remove "trunk" in git-svn checkout
X-Git-Tag: 0.1~558^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5d36f41c3fb55e9a896df223d7c0f01e4dad7c98;p=fdroidserver.git

Forgot to remove "trunk" in git-svn checkout
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 79554ea6..c99d9078 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -245,9 +245,8 @@ class vcs_gitsvn(vcs):
                     cwd=self.local, stdout=subprocess.PIPE)
                 rev = p.communicate()[0].rstrip()
                 if p.returncode != 0 or len(rev) == 0:
-                    # If it's not a svn rev, do a normal git checkout (master,
-                    # trunk, raw git sha, etc)
-                    if subprocess.call(['git', 'checkout', 'trunk'], cwd=self.local) != 0:
+                    # Try a plain git checkout as a last resort
+                    if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0:
                         raise VCSException("No git treeish found and direct git checkout failed")
                 # Check out the appropriate git revision...
                 if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0: