Package: dgit Version: 1.4 Severity: normal For example:
hephaestus ~/src/ocrmypdf % dgit quilt-fixup
Format `3.0 (quilt)', checking/updating patch stack
starting quiltify (multiple patches, linear mode)
HEAD is now at ddd62dc release
dgit: quilt fixup cannot be linear. Stopped at:
dgit: 293e3b0e..4dabc96d: changed
debian/patches/0001-patch-test-suite-executable.patch
dgit: quilt fixup naive history linearisation failed.
dgit: Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch
And yet:
hephaestus ~/src/ocrmypdf % dgit --quilt=smash quilt-fixup
Format `3.0 (quilt)', checking/updating patch stack
starting quiltify (multiple patches, smash mode)
HEAD is now at ddd62dc release
dpkg-source: info: using options from work/debian/source/options:
--extend-diff-ignore=\.git_archival\.txt
dpkg-source: info: there are no local changes to record
nothing quilty to commit, ok.
The user shouldn't need to specify --quilt=smash when there is no fixup
actually required. Perhaps dgit should run a test `dpkg-source
--commit` on a temporary copy of HEAD before it goes anywhere near the
git history.
(This should probably be fixed in a patch that also fixes #833025.)
-- System Information:
Debian Release: stretch/sid
APT prefers testing
APT policy: (900, 'testing')
Architecture: i386 (i686)
Kernel: Linux 4.5.0-2-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (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 20160104
ii coreutils 8.25-2
ii curl 7.50.1-1
ii devscripts 2.16.6
ii dpkg-dev 1.18.10
ii dput 0.9.6.4
ii git [git-core] 1:2.8.1-1
ii libdpkg-perl 1.18.10
ii libjson-perl 2.90-1
ii libperl5.22 [libdigest-sha-perl] 5.22.2-3
ii libwww-perl 6.15-1
ii perl 5.22.2-3
Versions of packages dgit recommends:
ii openssh-client [ssh-client] 1:7.2p2-8
Versions of packages dgit suggests:
ii sbuild 0.70.0-1
-- no debconf information
--
Sean Whitton
signature.asc
Description: PGP signature
