aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2007-02-27 19:11:24 +0100
committerGuido Guenther <agx@bogon.sigxcpu.org>2007-02-27 19:11:24 +0100
commit4adc330c56d19b22f85f455d8d879f5872f68031 (patch)
tree11b96904419c2af4c3856457100902e286c8f68f /gbp
parent1bf66bc8b1fc957b98a043f4f24743ef5dc57e10 (diff)
adjust to new output of git-status in git 1.5debian/0.2.26
Diffstat (limited to 'gbp')
-rw-r--r--gbp/git_utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/gbp/git_utils.py b/gbp/git_utils.py
index 19e280a1..54b70d25 100644
--- a/gbp/git_utils.py
+++ b/gbp/git_utils.py
@@ -56,9 +56,9 @@ class GitRepository(object):
self.__check_path()
clean_msg = 'nothing to commit'
out = self.__git_getoutput('status')
- if out[0].strip() == clean_msg:
+ if out[0].startswith('#') and out[1].strip().startswith(clean_msg):
ret = True
- elif out[0].startswith('#') and out[1].strip() == clean_msg:
+ elif out[0].strip().startswith(clean_msg): # git << 1.5
ret = True
else:
ret = False