From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 Nov 2013 18:16:21 +0000 (+0000)
Subject: Subcommand program or argument options containing hyphens work. (Eg, --dpkg-buildpack... 
X-Git-Tag: debian/0.18.1~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6bd3129e4a21d8eeb44442f078d81187aa388ba0

Subcommand program or argument options containing hyphens work. (Eg, --dpkg-buildpackage:blah was previously incorrectly rejected.)
---

diff --git a/debian/changelog b/debian/changelog
index 7611fcaa..6d6c3056 100644
--- 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 088f5d29..0f372f21 100755
--- 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, $_;