From a9c15c0abc6199722e2a15daa725d52f47f824d0 Mon Sep 17 00:00:00 2001 From: msocorcim Date: Wed, 9 May 2012 16:47:56 -0400 Subject: [PATCH] fix parsing "git branch" response so currently checked out branch is returned --- src/Tools/SubWCRev.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py index 843f0796b..53b8a2eb6 100644 --- a/src/Tools/SubWCRev.py +++ b/src/Tools/SubWCRev.py @@ -153,7 +153,10 @@ class GitControl(VersionControl): self.url = r.groups()[0] break self.hash=os.popen("git log -1 --pretty=format:%H").read() - self.branch=os.popen("git branch").read().split('\n')[0][2:] + for self.branch in os.popen("git branch").read().split('\n'): + if re.match( "\*", self.branch ) != None: + break + self.branch=self.branch[2:] return True def printInfo(self):