* Fix a bug in inheritance of default settings in chained .mrconfig files.

[code/myrepos.git] / mr

diff --git a/mr b/mr
index e29e3679bd75aa9a11a9e2b44d1d9f286a65e63d..adc05464671b0644be5e04b2b8167c6b89202cb6 100755 (executable)
--- a/mr
+++ b/mr
@@ -518,7 +518,10 @@ sub loadconfig { #{{{
 
                # copy in defaults from first parent
                my $parent=$dir;
 
                # copy in defaults from first parent
                my $parent=$dir;

-               while ($parent=~s/^(.*)\/[^\/]+\/?$/$1/) {
+               while ($parent=~s/^(.*\/)[^\/]+\/?$/$1/) {
+                       if ($parent eq '/') {
+                               $parent="";
+                       }

                        if (exists $config{$parent} &&
                            exists $config{$parent}{DEFAULT}) {
                                $config{$dir}{DEFAULT}={ %{$config{$parent}{DEFAULT}} };
                        if (exists $config{$parent} &&
                            exists $config{$parent}{DEFAULT}) {
                                $config{$dir}{DEFAULT}={ %{$config{$parent}{DEFAULT}} };