]> git.madduck.net Git - code/myrepos.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

* Fix mr register to work when -c is specified using a relative path and
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 18 Oct 2007 17:33:05 +0000 (13:33 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 18 Oct 2007 17:33:05 +0000 (13:33 -0400)
  is used to register a sibdirectory.

debian/changelog
mr

index 88335fb230867d2d31223bcd8a2cc33520bd4148..17eea2706b59d4974363d9835a78a97c23865f78 100644 (file)
@@ -1,3 +1,10 @@
+mr (0.4) UNRELEASED; urgency=low
+
+  * Fix mr register to work when -c is specified using a relative path and
+    is used to register a sibdirectory.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 18 Oct 2007 13:32:21 -0400
+
 mr (0.3) unstable; urgency=low
 
   * Add a check to make sure the expected directory exists after checkout.
 mr (0.3) unstable; urgency=low
 
   * Add a check to make sure the expected directory exists after checkout.
diff --git a/mr b/mr
index d170e67ff1430ca0433b8fea95892b51650a285b..e735b67b7335ce262ea327075636122ede8058f4 100755 (executable)
--- a/mr
+++ b/mr
@@ -261,7 +261,7 @@ my %alias;
 Getopt::Long::Configure("no_permute");
 my $result=GetOptions(
        "d|directory=s" => sub { $directory=abs_path($_[1]) },
 Getopt::Long::Configure("no_permute");
 my $result=GetOptions(
        "d|directory=s" => sub { $directory=abs_path($_[1]) },
-       "c|config=s" => \$ENV{MR_CONFIG},
+       "c|config=s" => sub { $ENV{MR_CONFIG}=abs_path($_[1]) },
        "v|verbose" => \$verbose,
        "s|stats" => \$stats,
 );
        "v|verbose" => \$verbose,
        "s|stats" => \$stats,
 );