Subcommand program or argument options containing hyphens work. (Eg, --dpkg-buildpack...

diff --git a/debian/changelog b/debian/changelog
index 7611fcaade49508c39eeb0b24d47a5d8a13292a6..6d6c30562026290e6619e42067af5d570d68a5b5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dgit (0.18.1) unstable; urgency=low
 
   Bugfixes:
   * sshpsql archive query method passes LANG=C.  Closes:#729788.
+  * Subcommand program or argument options containing hyphens work.
+    (Eg, --dpkg-buildpackage:blah was previously incorrectly rejected.)
 
   Packaging fixes:
   * Depend on dput.

diff --git a/dgit b/dgit
index 088f5d29174efbe53c5f534c86d3d05ef313bbfa..0f372f21a3b33c690c1a1a5a7004da788f98a08f 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1896,12 +1896,12 @@ sub parseopts () {
            } elsif (m/^--since-version=([^_]+|_)$/) {
                push @ropts, $_;
                $changes_since_version = $1;
-           } elsif (m/^--(\w+)=(.*)/s &&
+           } elsif (m/^--([-0-9a-z]+)=(.*)/s &&
                     ($om = $opts_opt_map{$1}) &&
                     length $om->[0]) {
                push @ropts, $_;
                $om->[0] = $2;
-           } elsif (m/^--(\w+):(.*)/s &&
+           } elsif (m/^--([-0-9a-z]+):(.*)/s &&
                     !$opts_opt_cmdonly{$1} &&
                     ($om = $opts_opt_map{$1})) {
                push @ropts, $_;