From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 25 Nov 2014 15:14:42 +0000 (+0000)
Subject: Reject (rather than ignoring) further options merged witht -wn, -wg, -wd.
X-Git-Tag: debian/0.30~276
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=dd2215fea46334342756a256883cb8d947697bcf;ds=sidebyside

Reject (rather than ignoring) further options merged witht -wn, -wg, -wd.
---

diff --git a/debian/changelog b/debian/changelog
index f035107a..b6dd3b28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,9 @@ dgit (0.23~) unstable; urgency=low
     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
diff --git a/dgit b/dgit
index 839f93ff..7cbef4e7 100755
--- 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 (s/^-wn//s) {
+		} elsif (s/^-wn$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'none';
-		} elsif (s/^-wg//s) {
+		} elsif (s/^-wg$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'git';
-		} elsif (s/^-wd//s) {
+		} elsif (s/^-wd$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'dpkg-source';
 		} else {