Finish dealing with uncuddled options

diff --git a/debian/changelog b/debian/changelog
index 59bcf79325f3ac61af0ed0d148fa1381acb2d5a9..0a4078c774a903293b3179ef897f35b8cae36a37 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ dgit (1.2~~) UNRELEASED; urgency=low
   * Correct manpage cross-reference to point to browse.d.d.o.
   * Honour *.clean-mode configuration setting for --clean= mode.
   * In manpage move dgit.default.* to main CONFIGURATION section.
   * Correct manpage cross-reference to point to browse.d.d.o.
   * Honour *.clean-mode configuration setting for --clean= mode.
   * In manpage move dgit.default.* to main CONFIGURATION section.

-  * WIP improvements to option handling of options with values
+  * No longer require option values to be cuddled: support `--opt val' and
+    `-o val'.  Closes:#763332.

 
  --
 
 
  --
 

diff --git a/dgit b/dgit
index 6ca1f33b38fdfb8408d5bf88203ddcbb94bf32af..eb9a97c3d0269604ca3bd1a1995510b79b4341ba 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3246,9 +3246,6 @@ sub parseopts () {
                    push @ropts, $&;
                    push @changesopts, $_;
                    $_ = '';
                    push @ropts, $&;
                    push @changesopts, $_;
                    $_ = '';

-               } elsif (m/^-[dCk]$/) {
-                   badusage
- "option \`$_' requires an argument (and no space before the argument)";

                } elsif (s/^-wn$//s) {
                    push @ropts, $&;
                    $cleanmode = 'none';
                } elsif (s/^-wn$//s) {
                    push @ropts, $&;
                    $cleanmode = 'none';

diff --git a/dgit.1 b/dgit.1
index b56a8fd7e73c03b736dffe3836ca5bf2e180aa0e..926a9c65d300a95f4341c00324cd92fb69a17a55 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -785,8 +785,6 @@ There should be an option which arranges for the `3.0 (quilt)'
 autocommit(s) to not appear on your HEAD, but instead only in the
 remote tracking suite branch.
 
 autocommit(s) to not appear on your HEAD, but instead only in the
 remote tracking suite branch.
 

-The option parser requires values to be cuddled to the option name.
-

 --dry-run does not always work properly, as not doing some of the git
 fetches may result in subsequent actions being different.  Doing a
 non-dry-run dgit fetch first will help.
 --dry-run does not always work properly, as not doing some of the git
 fetches may result in subsequent actions being different.  Doing a
 non-dry-run dgit fetch first will help.