summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit7
1 files changed, 3 insertions, 4 deletions
diff --git a/dgit b/dgit
index 972a839..f6324e0 100755
--- a/dgit
+++ b/dgit
@@ -48,13 +48,12 @@ our $changesfile;
our $buildproductsdir = '..';
our $new_package = 0;
our $ignoredirty = 0;
-our $noquilt = 0;
our $rmonerror = 1;
our $existing_package = 'dpkg';
our $cleanmode = 'dpkg-source';
our $changes_since_version;
our $quilt_mode;
-our $quilt_modes_re = 'linear|smash|auto|nofix';
+our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck';
our $we_are_responder;
our $initiator_tempdir;
@@ -1487,7 +1486,7 @@ sub get_source_format () {
sub madformat ($) {
my ($format) = @_;
return 0 unless $format eq '3.0 (quilt)';
- if ($noquilt) {
+ if ($quilt_mode eq 'nocheck') {
progress "Not doing any fixup of \`$format' due to --no-quilt-fixup";
return 0;
}
@@ -2683,7 +2682,7 @@ sub parseopts () {
$ignoredirty = 1;
} elsif (m/^--no-quilt-fixup$/s) {
push @ropts, $_;
- $noquilt = 1;
+ $quilt_mode = 'nocheck';
} elsif (m/^--no-rm-on-error$/s) {
push @ropts, $_;
$rmonerror = 0;