X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=dgit;h=9602b9891951ebacaae42b818396d25b21447e59;hb=7de1cca83307cda0d0bf04f8646e23da334f19ef;hp=02acfa7fac5be920236d18cc4fdd51f101be3901;hpb=7cf634614b9a4ee18a70030e3b340dccd470f908;p=dgit.git

diff --git a/dgit b/dgit
index 02acfa7f..9602b989 100755
--- a/dgit
+++ b/dgit
@@ -37,6 +37,7 @@ our $dryrun = 0;
 our $changesfile;
 our $new_package = 0;
 our $ignoredirty = 0;
+our $noquilt = 0;
 our $existing_package = 'dpkg';
 our $cleanmode = 'dpkg-source';
 
@@ -804,6 +805,10 @@ sub madformat ($) {
     my ($format) = @_;
     return 0 unless $format eq '3.0 (quilt)';
     print "Format \`$format', urgh\n";
+    if ($noquilt) {
+	print "Not doing any fixup of \`$format' due to --no-quilt-fixup";
+	return 0;
+    }
     return 1;
 }
 
@@ -1197,6 +1202,8 @@ sub parseopts () {
 		badusage "unknown cleaning mode \`$1'";
 	    } elsif (m/^--ignore-dirty$/s) {
 		$ignoredirty = 1;
+	    } elsif (m/^--no-quilt-fixup$/s) {
+		$noquilt = 1;
 	    } else {
 		badusage "unknown long option \`$_'";
 	    }