From 47f50cd2225f11274f12c59e896413d0279176fe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Guido=20G=C3=BCnther?= Date: Mon, 7 Nov 2011 17:37:01 +0100 Subject: [PATCH] GitRepository: handle case when not on any branch --- gbp/git.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gbp/git.py b/gbp/git.py index b533116..95876f9 100644 --- a/gbp/git.py +++ b/gbp/git.py @@ -238,7 +238,10 @@ class GitRepository(object): @property def branch(self): """The currently checked out branch""" - return self.get_branch() + try: + return self.get_branch() + except GitRepositoryError: + return None @property def head(self): @@ -284,7 +287,10 @@ class GitRepository(object): @return: current branch @rtype: C{str} """ - out, dummy = self.__git_getoutput('symbolic-ref', [ 'HEAD' ]) + out, ret = self.__git_getoutput('symbolic-ref', [ 'HEAD' ]) + if ret: + raise GitRepositoryError("Currently not on a branch") + ref = out[0][:-1] # Check if ref really exists failed = self.__git_getoutput('show-ref', [ ref ])[1] -- 2.7.4