From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 25 Nov 2014 15:12:42 +0000 (+0000)
Subject: Complain about lack of cuddled values for value-taking single-letter options, rather... 
X-Git-Tag: debian/0.30~277
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8dd2ab0c514d4e88aa45dad955bf85aa0f713ae0;p=dgit.git

Complain about lack of cuddled values for value-taking single-letter options, rather than thinking the user meat an empty value. Closes:#763332.
---

diff --git a/debian/changelog b/debian/changelog
index 6152a28f..f035107a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,10 @@ dgit (0.23~) unstable; urgency=low
     unconditionally invoke curl and have no code to use wget.
     Closes:#760805.
 
+  * Complain about lack of cuddled values for value-taking single-letter
+    options, rather than thinking the user meat an empty value.
+    Closes:#763332.
+
  --
 
 dgit (0.22.1) unstable; urgency=high
diff --git a/dgit b/dgit
index d936acdf..839f93ff 100755
--- a/dgit
+++ b/dgit
@@ -2718,17 +2718,20 @@ sub parseopts () {
 		} elsif (s/^-c(.*=.*)//s) {
 		    push @ropts, $&;
 		    push @git, '-c', $1;
-		} elsif (s/^-d(.*)//s) {
+		} elsif (s/^-d(.+)//s) {
 		    push @ropts, $&;
 		    $idistro = $1;
-		} elsif (s/^-C(.*)//s) {
+		} elsif (s/^-C(.+)//s) {
 		    push @ropts, $&;
 		    $changesfile = $1;
 		    if ($changesfile =~ s#^(.*)/##) {
 			$buildproductsdir = $1;
 		    }
-		} elsif (s/^-k(.*)//s) {
+		} elsif (s/^-k(.+)//s) {
 		    $keyid=$1;
+		} elsif (m/^-[vdCk]$/) {
+		    badusage
+ "option \`$_' requires an argument (and no space before the argument)";
 		} elsif (s/^-wn//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'none';