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

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 2e6f49316bb04e0a828d65d2162093c666416d51..cdc939a60e59ecbb590d1ed72ff1f931e6d2ed42 100644 (file)
--- 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;
                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 = { url => $nick };
                } elsif (m!\Arepo\.path=(.+)\z!) {
                        if (defined $repo) {

-                               $repo->{path} = $1;
+                               $repo->{dir} = $1;

                        } else {
                                warn "$_ without repo.url\n";
                        }
                        } else {
                                warn "$_ without repo.url\n";
                        }


@@ -326,7 +326,7 @@ sub parse_cgitrc {
                        $self->{-cgit_static}->{$1} = 1;
                }
        }
                        $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
 }
 
 # parse a code repo