Hi Jonathan,
On Sat, Jan 04, 2014 at 04:04:02PM -0800, Jonathan Nieder wrote:
Package: git
Version: 1:1.8.5~rc0-1
Severity: important
Tags: patch
git v1.8.5-rc0~101^2~3 (status: disable display of '#' comment prefix by
default, 2013-09-06) broke git-buildpackage:
$ git import-dsc ../dash_0.5.7-3+nmu1.dsc
gbp:error: Repository has uncommitted changes, commit these first:
gbp:error: On branch debian-sid
Your branch is up-to-date with 'debian/debian-sid'.
nothing to commit, working directory clean
(That's with git-buildpackage 0.5.32.) git-buildpackage 0.6.5~3 (Be
more robust about git status output changes, 2013-10-16) fixes it.
How about this patch?
Great! We could fix this by a 0.5.32.1 in bpo in case git slips in there
as well.
Cheers,
-- Guido
diff --git i/debian/changelog w/debian/changelog
index 71a50df..cca04c7 100644
--- i/debian/changelog
+++ w/debian/changelog
@@ -3,6 +3,9 @@ git (1:1.8.5.2-1.1) unstable; urgency=low
* /etc/bash_completion.d/git-prompt: check for git-sh-prompt
and do not source it if git is removed but not purged (thx
Craig Small; closes: #726669).
+ * debian/control: package git Breaks: git-buildpackage versions
+that rely on output from 'git status' without the --porcelain
+flag (see #726260).
-- Jonathan Nieder jrnie...@gmail.com Fri, 03 Jan 2014 15:44:36 -0800
diff --git i/debian/control w/debian/control
index aa180bb..a36aaa6 100644
--- i/debian/control
+++ w/debian/control
@@ -30,6 +30,7 @@ Suggests: gettext-base, git-daemon-run |
git-daemon-sysvinit,
Replaces: gitweb ( 1:1.7.4~rc1),
git-core ( 1:1.7.0.4-1.)
Breaks: bash-completion ( 1:1.90-1), gitweb ( 1:1.7.4~rc1),
+ git-buildpackage ( 0.6.5),
cogito (= 0.18.2+),
stgit ( 0.15), stgit-contrib ( 0.15), gitpkg ( 0.15),
guilt ( 0.33), gitosis ( 0.2+20090917-7),
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
