Complain about lack of cuddled values for value-taking single-letter options, rather...

[dgit.git] / dgit

diff --git a/dgit b/dgit
index f6324e02a59a3a8cc6b363b455c4ca3f413ca32a..839f93ffe04b34509e6b4131979e231eb65ca3aa 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1413,6 +1413,7 @@ sub clone ($) {
     }
     fetch_from_archive() or no_such_package;
     my $vcsgiturl = $dsc->{'Vcs-Git'};
+    $vcsgiturl =~ s/\s+-b\s+\S+//g;
     if (length $vcsgiturl) {
        runcmd @git, qw(remote add vcs-git), $vcsgiturl;
     }
@@ -2717,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';