Package: dgit Version: 1.3 Severity: normal Using this package repo:
ssh://i...@git.debian.org/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
