aboutsummaryrefslogtreecommitdiff
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
parent1bf66bc8b1fc957b98a043f4f24743ef5dc57e10 (diff)
adjust to new output of git-status in git 1.5debian/0.2.26
-rw-r--r--debian/changelog6
-rw-r--r--gbp/git_utils.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 1fce6dfa..63e36741 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,14 @@
git-buildpackage (0.2.26) unstable; urgency=low
- * UNRELEASED
* use GbpError everywhere
* move commands into a submodule
* git-import-orig: pass --verbose on to git_load_dirs
- * use default python version in setup.py
+ * use default python version in setup.py
* depend on a git that has the "removed files left in working copy after
merge" bug (#410325)
+ * adjust to new output of git-status in git 1.5
- -- Guido Guenther <agx@sigxcpu.org> Sun, 11 Feb 2007 22:52:31 +0100
+ -- Guido Guenther <agx@sigxcpu.org> Tue, 27 Feb 2007 19:11:06 +0100
git-buildpackage (0.2.25) unstable; urgency=low
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