From 75b7a4c726144473f4a0c38d17d34d7b67c0f8ba Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 31 May 2019 20:36:37 +0100 Subject: [PATCH] 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 --- dgit | 4 ++++ 1 file changed, 4 insertions(+) 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); -- 2.30.2