From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 2 Nov 2007 03:53:15 +0000 (-0400)
Subject: Allow option bundling, mostly so "-j2" will work.
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/7d95a4a9b0357e85eb8b15ebf04d2e4188b4479c

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

diff --git a/debian/changelog b/debian/changelog
index 52cdcbe..bc3b4e6 100644
--- 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.
+  * 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
 
diff --git a/mr b/mr
index b8d5835..9501322 100755
--- a/mr
+++ b/mr
@@ -1020,7 +1020,7 @@ sub expandaction { #{{{
 } #}}}
 
 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 },