about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-04-15 06:35:30 +0000
committerEric Wong <e@80x24.org>2019-04-15 06:35:30 +0000
commit42174f7db54f02f8969e8b8434f92c94519a18d3 (patch)
treed1eb054935abdeb694e274a36ef56dd33a47446d
parent33f5e614291025447dced2aca7258f64bb589d0b (diff)
downloadpublic-inbox-42174f7db54f02f8969e8b8434f92c94519a18d3.tar.gz
config: fix regression in repo.path => coderepo.dir mapping
We parse cgitrc for "repo.path", while we use "coderepo.dir" to
mean the same thing for non-cgit users.  So I ended up confusing
myself, here.

But then again, git uses "--git-dir" and "GIT_DIR", so I suspect
"dir" is the better choice than "path", here
-rw-r--r--lib/PublicInbox/Config.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 2e6f4931..cdc939a6 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -297,11 +297,11 @@ sub parse_cgitrc {
                 chomp;
                 if (m!\Arepo\.url=(.+?)/*\z!) {
                         my $nick = $1;
-                        cgit_repo_merge($self, $repo->{path}, $repo) if $repo;
+                        cgit_repo_merge($self, $repo->{dir}, $repo) if $repo;
                         $repo = { url => $nick };
                 } elsif (m!\Arepo\.path=(.+)\z!) {
                         if (defined $repo) {
-                                $repo->{path} = $1;
+                                $repo->{dir} = $1;
                         } else {
                                 warn "$_ without repo.url\n";
                         }
@@ -326,7 +326,7 @@ sub parse_cgitrc {
                         $self->{-cgit_static}->{$1} = 1;
                 }
         }
-        cgit_repo_merge($self, $repo->{path}, $repo) if $repo;
+        cgit_repo_merge($self, $repo->{dir}, $repo) if $repo;
 }
 
 # parse a code repo