From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 31 May 2019 19:36:37 +0000 (+0100)
Subject: dgit: Reject split brain quilt modes with single-debian-patch
X-Git-Tag: archive/debian/9.0~128
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=75b7a4c726144473f4a0c38d17d34d7b67c0f8ba;p=dgit.git

dgit: Reject split brain quilt modes with single-debian-patch

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>
---

diff --git a/dgit b/dgit
index 6a351f9d..cbdf3764 100755
--- 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);