Your message dated Sat, 22 Aug 2015 15:20:06 +0000
with message-id <[email protected]>
and subject line Bug#796016: fixed in dgit 1.4
has caused the Debian Bug report #796016,
regarding dgit: Does not work with single-debian-patch (perhaps only in the
presence of merge commits)
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
796016: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=796016
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: dgit
Version: 1.3
Severity: normal
Using this package repo:
ssh://[email protected]/git/collab-maint/sunxi-tools.git wip/dgit
Which is a 3.0 (quilt) package with single-debian-patch enabled in
debian/source/local-options and running 'dgit build-source' results in:
$ dgit build-source
Format `3.0 (quilt)', checking/updating patch stack
HEAD is now at c7105b6 Switch to debian/$version tags.
dgit: quilt fixup cannot be linear. Stopped at:
dgit: ..: merge (2 nontrivial parents)
dgit: quilt fixup naive history linearisation failed.
dgit: Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch
Moving debian/source/local-options to debian/source/options does not change the
behaviour.
Using --quilt=smash as suggested does produce a source package however it also
produces a commit adding the single-debian-patch to the source repo.
My main reason for using single-debian-patch is that dpkg-source will create
that patch for me without needing to have debian/patches in git at all (or more
importantly maintain it when I git cherry-pick).
I'm hoping that it will be possible to avoid injecting this synthesised commit
only into my maintainer history (perhaps only pushing it to the dgit repo?). If
not then I would probably choose to switch to more explicitly managing
debian/patches e.g. with git-dpm or gbp pq.
As an aside the current synthesised patch does not honour
debian/source/patch-header which is what dpkg-source would use as the intro to
the patch (in my case I use it to point people to git for the full history,
although dgit does make that somewhat less necessary).
Thanks,
Ian.
-- System Information:
Debian Release: stretch/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (500,
'oldstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.1.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages dgit depends on:
ii ca-certificates 20150426
ii coreutils 8.23-4
ii curl 7.43.0-1
ii devscripts 2.15.8
ii dpkg-dev 1.18.1
ii dput 0.9.6.4
ii git [git-core] 1:2.5.0-1
ii libdpkg-perl 1.18.1
ii libjson-perl 2.90-1
ii libwww-perl 6.13-1
ii perl [libdigest-sha-perl] 5.20.2-6
Versions of packages dgit recommends:
ii openssh-client [ssh-client] 1:6.7p1-6
Versions of packages dgit suggests:
ii sbuild 0.65.2-1
-- debconf-show failed
--- End Message ---
--- Begin Message ---
Source: dgit
Source-Version: 1.4
We believe that the bug you reported is fixed in the latest version of
dgit, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Ian Jackson <[email protected]> (supplier of updated dgit package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sat, 22 Aug 2015 15:31:02 +0100
Source: dgit
Binary: dgit dgit-infrastructure
Architecture: all source
Version: 1.4
Distribution: unstable
Urgency: high
Maintainer: Ian Jackson <[email protected]>
Changed-By: Ian Jackson <[email protected]>
Closes: 796016 796019
Description:
dgit - git interoperability with the Debian archive
dgit-infrastructure - dgit server backend infrastructure
Changes:
dgit (1.4) unstable; urgency=high
.
Bugfixes:
* Unbreak --dry-run (`exiting subroutine via next', broken in
ac221d67, bug released in 0.22).
* When running git-add in commit-quilty-patch, properly escape
filenames (which git-add treats as glob patterns).
* When running git-add in commit-quilty-patch, use -f and sometimes -A,
so as to avoid being broken by any .gitignore, etc.
* When quilt linearisation fails, print the right information in
the error message. (This has been broken forever.)
* Cope properly with `3.0 (quilt)' with single-debian-patch.
Closes:#796016. (Still does not work with wheezy's dpkg-source, so
no test case yet.)
* With dgit sbuild, pass our -d before the user's arguments, so that
the user can override it. Closes:#796019.
.
New checks and improved behaviours:
* Detect and reject git trees containing debian/source/local-options
or debian/source/local-patch-header.
* In --dry-run mode, _do_ actually run dpkg-source --commit so that we
actually do construct the quilt fixup commit; instead, honour
--dry-run by avoiding pulling it back to your HEAD.
* quilt-fixup checks that the git tree is clean, as for build-prep.
.
Documentation:
* In dgit(7), discuss binaries and documentation present in upstream but
removed by rules clean.
.
Test suite:
* Run quilt-fixup with -wgf in distropatches-reject,
so that we don't need build-depends.
Checksums-Sha1:
79edec3d4c86cad918d4e36426210876c24b4de5 1263 dgit_1.4.dsc
cadc2580346331394744a3df77ed398e9515b404 250642 dgit_1.4.tar.gz
afac9c4d7de0979492ddcb3dae7835e32617c161 32920 dgit-infrastructure_1.4_all.deb
31d7a5ecea8ec1e70f5b966768586e613268d411 56318 dgit_1.4_all.deb
Checksums-Sha256:
215c12d89814b242c15a030e9d78a3177d2198de90a8e6aadb528ee4992e75da 1263
dgit_1.4.dsc
beee556e6bf0de96f15b60ede2775efd9763ede1976f29c6c25d0b770513fd01 250642
dgit_1.4.tar.gz
24e2a64abb7d3b9648677fa60059d4aad55925f7bfb22fcd0d91f684be778724 32920
dgit-infrastructure_1.4_all.deb
9a9941938ddc0c9dee471818f3010f21f2b0690e3e6c6d511c98f13460c3495a 56318
dgit_1.4_all.deb
Files:
96e8a537f9c5eb69d26a78c8e4576b03 1263 devel optional dgit_1.4.dsc
b5229376e02b19b38a7e5e3812954e42 250642 devel optional dgit_1.4.tar.gz
eb086889d7a3fa92fbe8df695e8b5724 32920 devel extra
dgit-infrastructure_1.4_all.deb
3b40db92c1a3d4b5130ca399acb11a14 56318 devel optional dgit_1.4_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQEcBAEBCAAGBQJV2IhKAAoJEOPjOSNItQ05ZzwIAJuFDW6QG6xzOlo7qvcuHNdF
xABWWiLVb7cD7uhQnTf/3fIvIpctcRnAYTb6QMLO3/PEWz6343aIgv4qXNEZXZEC
MtO82Fsg7db6hRyw1rdPkP7m6E+q5bY/3+7+pyR9OZRW/FGkY+JeiEVBLORKPLJ+
/hZJxe90VbWr5Wk72CktN/Esrnnf+/PF9KZUgCBCm0TfCj21RkRFJ+vlrvRi3cow
SqhB02CSpQwkct1VRhXdyMOBt/Mf6GEEv7leFCN5awsOQBMpqf9OBReUR4a1swBv
5/pL+9o6TAGpXSpzRwFq5F5U7EsY5QegLZ/BWReGoxE3SiMZ2Xmva4FetdllwtM=
=O5ld
-----END PGP SIGNATURE-----
--- End Message ---
