From 4ba9da090632fd86a5eafb2cfd32f077f0e110c9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Sun, 29 Jun 2014 01:29:31 +0200 Subject: [PATCH] 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. --- fdroidserver/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) -- 2.30.2