]> 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:

Always ensure all parent .mrconfig files are loaded consistent-parent-config
authormartin f. krafft <madduck@madduck.net>
Tue, 9 Sep 2014 07:02:09 +0000 (09:02 +0200)
committermartin f. krafft <madduck@madduck.net>
Tue, 9 Sep 2014 07:02:09 +0000 (09:02 +0200)
There may be parent .mrconfig files between ~/.mrconfig and ./.mrconfig
that is not chain-loaded from ~/.mrconfig. Such is the case if you e.g.
download a team-repository to work (such as the debconf-team repo), but
you don't want to put it into the ~/.mrconfig chain.

In those cases, all parent .mrconfig files should be loaded, in case
there are settings or lib snippets needed in subdirectories.

Fortunately, the code already ensures that config files are only loaded
once, so this is trivial to patch.

Signed-off-by: martin f. krafft <madduck@madduck.net>
mr

diff --git a/mr b/mr
index b7cd3cb61c16b7a46bd116c868121597d2743cd0..3c5321fc3fcf0393d4cd6ec7ecc4b48e39009411 100755 (executable)
--- a/mr
+++ b/mr
@@ -1317,6 +1317,7 @@ sub loadconfig {
                        if ($parent eq '/') {
                                $parent="";
                        }
+                       loadconfig($parent);
                        if (exists $config{$parent} &&
                            exists $config{$parent}{DEFAULT}) {
                                $config{$dir}{DEFAULT}={ %{$config{$parent}{DEFAULT}} };