From 9d08d49c68541babf0e618b20f5a1cd11c7c256e Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 29 Mar 2021 23:58:54 +0000 Subject: git: local_nick: handle trailing or redundant '/' in git_dir Some cgit configs use trailing slashes in pathnames which we preserve internally. Before this change, trailing slashes in cgit config files was causing ViewVCS (SolverGit) output to show up as "???" for coderepos without cgitUrl configured. --- lib/PublicInbox/Git.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm index 2ae5eff9..96ac17a3 100644 --- a/lib/PublicInbox/Git.pm +++ b/lib/PublicInbox/Git.pm @@ -426,7 +426,7 @@ sub local_nick ($) { my ($self) = @_; my $ret = '???'; # don't show full FS path, basename should be OK: - if ($self->{git_dir} =~ m!/([^/]+)(?:/\.git)?\z!) { + if ($self->{git_dir} =~ m!/([^/]+)(?:/*\.git/*)?\z!) { $ret = "$1.git"; } wantarray ? ($ret) : $ret; -- cgit v1.2.3-24-ge0c7