From 42174f7db54f02f8969e8b8434f92c94519a18d3 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 15 Apr 2019 06:35:30 +0000 Subject: 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 --- lib/PublicInbox/Config.pm | 6 +++--- 1 file 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 -- cgit v1.2.3-24-ge0c7