chiark / gitweb /
dgit: Reject split brain quilt modes with single-debian-patch
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 31 May 2019 19:36:37 +0000 (20:36 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 28 Jun 2019 11:45:38 +0000 (12:45 +0100)
Right now, this malfunctions in dgit: we do not do the split brain
stuff.  And most of these combinations do not appear to make very much
sense.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit

diff --git a/dgit b/dgit
index 6a351f9d05754d82fed10248de28766ef6493d3f..cbdf3764c2463782dbe7285bb278a4e70ea96698 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -5824,6 +5824,10 @@ sub build_maybe_quilt_fixup () {
     my $upstreamversion = upstreamversion $version;
 
     if ($fopts->{'single-debian-patch'}) {
+       fail f_
+ "quilt mode %s does not make sense (or is not supported) with single-debian-patch",
+           $quilt_mode
+           if quiltmode_splitbrain();
        quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
     } else {
        quilt_fixup_multipatch($clogp, $headref, $upstreamversion);