chiark / gitweb /
Reject (rather than ignoring) further options merged witht -wn, -wg, -wd.
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 25 Nov 2014 15:14:42 +0000 (15:14 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 25 Nov 2014 15:14:42 +0000 (15:14 +0000)
debian/changelog
dgit

index f035107..b6dd3b2 100644 (file)
@@ -51,6 +51,9 @@ dgit (0.23~) unstable; urgency=low
     options, rather than thinking the user meat an empty value.
     Closes:#763332.
 
     options, rather than thinking the user meat an empty value.
     Closes:#763332.
 
+  * Reject (rather than ignoring) further options merged witht -wn, -wg,
+    -wd.
+
  --
 
 dgit (0.22.1) unstable; urgency=high
  --
 
 dgit (0.22.1) unstable; urgency=high
diff --git a/dgit b/dgit
index 839f93f..7cbef4e 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2732,13 +2732,13 @@ sub parseopts () {
                } elsif (m/^-[vdCk]$/) {
                    badusage
  "option \`$_' requires an argument (and no space before the argument)";
                } elsif (m/^-[vdCk]$/) {
                    badusage
  "option \`$_' requires an argument (and no space before the argument)";
-               } elsif (s/^-wn//s) {
+               } elsif (s/^-wn$//s) {
                    push @ropts, $&;
                    $cleanmode = 'none';
                    push @ropts, $&;
                    $cleanmode = 'none';
-               } elsif (s/^-wg//s) {
+               } elsif (s/^-wg$//s) {
                    push @ropts, $&;
                    $cleanmode = 'git';
                    push @ropts, $&;
                    $cleanmode = 'git';
-               } elsif (s/^-wd//s) {
+               } elsif (s/^-wd$//s) {
                    push @ropts, $&;
                    $cleanmode = 'dpkg-source';
                } else {
                    push @ropts, $&;
                    $cleanmode = 'dpkg-source';
                } else {