diff options
| -rwxr-xr-x | dgit | 7 | ||||
| -rw-r--r-- | dgit.1 | 2 |
2 files changed, 4 insertions, 5 deletions
@@ -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; @@ -276,7 +276,7 @@ because the dgit git tree does not have a .B .pc directory.) .TP -.BR --no-quilt-fixup +.BR --quilt=nocheck | --no-quilt-fixup Do not check whether up source format `3.0 (quilt)' metadata needs fixing up. If you use this option and the metadata did in fact need fixing up, dgit push will fail. |