From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 24 Jun 2008 03:27:10 +0000 (-0400)
Subject: Fix mr -c <config> register. (Thanks, Daniel Bungert)
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/d9cd1417b07c0d7af7b6aaf57f2d24b17662e62d

Fix mr -c <config> register. (Thanks, Daniel Bungert)
---

diff --git a/debian/changelog b/debian/changelog
index 8ed25d2..31f1c1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ mr (0.30) UNRELEASED; urgency=low
   [ 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
diff --git a/mr b/mr
index 4fc7971..3148a3f 100755
--- a/mr
+++ b/mr
@@ -1028,8 +1028,11 @@ sub config { #{{{
 
 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=~/\/$/;