GitRepository: speed up get_branch() and make it more robust

by using 'git symbolic-ref'

diff --git a/gbp/git.py b/gbp/git.py
index 30417f5b3414422bf36300cc914916f385a3b03f..d8ba6e848530f96e19c156baafd4ee569884f331 100644 (file)
--- a/gbp/git.py
+++ b/gbp/git.py
@@ -361,9 +361,12 @@ class GitRepository(object):
         @return: current branch
         @rtype: string
         """
-        for line in self.__git_getoutput('branch', [ '--no-color' ])[0]:
-            if line.startswith('*'):
-                return line.split(' ', 1)[1].strip()
+        out, dummy = self.__git_getoutput('symbolic-ref', [ 'HEAD' ])
+        ref = out[0][:-1]
+        # Check if ref really exists
+        failed = self.__git_getoutput('show-ref', [ ref ])[1]
+        if not failed:
+            return ref[11:] # strip /refs/heads
 
     def get_merge_branch(self, branch):
         """