]> 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 -c <config> register. (Thanks, Daniel Bungert)
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 24 Jun 2008 03:27:10 +0000 (23:27 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 24 Jun 2008 03:27:10 +0000 (23:27 -0400)
debian/changelog
mr

index 8ed25d2a24b431692f203c7ca94592ae2c284868..31f1c1d2ebddc9afded901f516a8e81125b04e48 100644 (file)
@@ -3,6 +3,9 @@ mr (0.30) UNRELEASED; urgency=low
   [ martin f. krafft ]
   * Several git-fake-bare improvements.
 
   [ martin f. krafft ]
   * Several git-fake-bare improvements.
 
+  [ Joey Hess ]
+  * Fix mr -c <config> register. (Thanks, Daniel Bungert)
+
  -- Joey Hess <joeyh@debian.org>  Sun, 18 May 2008 17:41:53 -0400
 
 mr (0.29) unstable; urgency=low
  -- Joey Hess <joeyh@debian.org>  Sun, 18 May 2008 17:41:53 -0400
 
 mr (0.29) unstable; urgency=low
diff --git a/mr b/mr
index 4fc7971f4fcc97ff4c3cc4e8d5d0f19288a12028..3148a3f94fba74eb4a857642fbe5595e5db5d8f7 100755 (executable)
--- a/mr
+++ b/mr
@@ -1028,8 +1028,11 @@ sub config { #{{{
 
 sub register { #{{{
        if ($config_overridden) {
 
 sub register { #{{{
        if ($config_overridden) {
-               ($directory)=$ENV{MR_CONFIG}=~/^(.*\/)[^\/]+$/;
-       } else {
+               # Find the directory that the specified config file is
+               # located in.
+               ($directory)=abs_path($ENV{MR_CONFIG})=~/^(.*\/)[^\/]+$/;
+       }
+       else {
                # Find the closest known mrconfig file to the current
                # directory.
                $directory.="/" unless $directory=~/\/$/;
                # Find the closest known mrconfig file to the current
                # directory.
                $directory.="/" unless $directory=~/\/$/;