[jhbuild] properly get the current branch from the checkout dir, not the source dir



commit 3b29fb6cbd5e60f94d6a00e265c4ad605d83f042
Author: Frederic Peters <fpeters 0d be>
Date:   Thu Apr 30 20:03:45 2009 +0200

    properly get the current branch from the checkout dir, not the source dir
---
 jhbuild/versioncontrol/git.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/jhbuild/versioncontrol/git.py b/jhbuild/versioncontrol/git.py
index d76b1a9..9ee5f91 100644
--- a/jhbuild/versioncontrol/git.py
+++ b/jhbuild/versioncontrol/git.py
@@ -139,7 +139,7 @@ class GitBranch(Branch):
     branchname = property(branchname)
 
     def get_current_branch(self):
-        for line in get_output(['git', 'branch'], cwd=self.srcdir).splitlines():
+        for line in get_output(['git', 'branch'], cwd=self.get_checkoutdir()).splitlines():
             if line[0] == '*':
                 return line[2:]
         return None



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]