diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-05-31 20:36:37 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-28 12:45:38 +0100 |
commit | 75b7a4c726144473f4a0c38d17d34d7b67c0f8ba (patch) | |
tree | 406a81481a020fea3401685a916ff94ac9730b69 /dgit | |
parent | 6a9372d21a3816e93c2096df650c15f2a1227d1d (diff) |
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>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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); |