jhbuild r2461 - in trunk: . jhbuild/versioncontrol

[johncarr svn gnome org]

Author: johncarr
Date: Wed Nov  5 14:44:12 2008
New Revision: 2461
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2461&view=rev

Log:
* jhbuild/versioncontrol/git.py:
Support checking out branches when cloning from git-svn repos.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/versioncontrol/git.py

Modified: trunk/jhbuild/versioncontrol/git.py
==============================================================================
--- trunk/jhbuild/versioncontrol/git.py	(original)
+++ trunk/jhbuild/versioncontrol/git.py	Wed Nov  5 14:44:12 2008
@@ -120,8 +120,8 @@
             return False
 
     def branchname(self):
-        for b in [self.tag, 'origin/' + str(self.branch), self.branch,
-                  'origin/master', 'origin/trunk', 'master', 'trunk']:
+        for b in [self.tag, 'origin/' + str(self.branch), 'origin/svn/' + str(self.branch),
+                  self.branch, 'origin/master', 'origin/trunk', 'master', 'trunk']:
             if self.branch_exist(b):
                 return b
         raise GitUnknownBranchNameError()