Allow option bundling, mostly so "-j2" will work.

diff --git a/debian/changelog b/debian/changelog
index 52cdcbe8fa456cd5dc7538cf37df39a2d58f31b2..bc3b4e65583f4a1be3f652d15ca2ca56a1c5a419 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ mr (0.11) UNRELEASED; urgency=low
 
   * Avoid using commands like git-config and instead use "git config".
     In some configurations, only the main git command is in the path.
 
   * Avoid using commands like git-config and instead use "git config".
     In some configurations, only the main git command is in the path.

+  * Allow option bundling, mostly so "-j2" will work.

 
 

- -- Joey Hess <joeyh@debian.org>  Tue, 30 Oct 2007 16:08:31 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 01 Nov 2007 23:52:50 -0400

 
 mr (0.10) unstable; urgency=low
 
 
 mr (0.10) unstable; urgency=low
 

diff --git a/mr b/mr
index b8d5835e8a038800d50629ea7daf498c556d5f7c..9501322e7a6d04004266f4a21bdc64136dc2dfc2 100755 (executable)
--- a/mr
+++ b/mr
@@ -1020,7 +1020,7 @@ sub expandaction { #{{{
 } #}}}
 
 sub getopts { #{{{
 } #}}}
 
 sub getopts { #{{{

-       Getopt::Long::Configure("no_permute");
+       Getopt::Long::Configure("bundling", "no_permute");

        my $result=GetOptions(
                "d|directory=s" => sub { $directory=abs_path($_[1]) },
                "c|config=s" => sub { $ENV{MR_CONFIG}=$_[1]; $config_overridden=1 },
        my $result=GetOptions(
                "d|directory=s" => sub { $directory=abs_path($_[1]) },
                "c|config=s" => sub { $ENV{MR_CONFIG}=$_[1]; $config_overridden=1 },