* [PATCH 1/3] git: simplify local_nick, avoid "foo.git.git"
2021-10-23 20:19 4% [PATCH 0/3] www: coderepo-related cleanups + fixes Eric Wong
@ 2021-10-23 20:19 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-10-23 20:19 UTC (permalink / raw)
To: meta
We need to use a non-greedy regexp to avoid capturing the
".git" suffix in the pathname before blindly appending our
own.
---
lib/PublicInbox/Git.pm | 9 ++-------
t/git.t | 8 +++++++-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index e634ca55..374a3b4d 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -442,13 +442,8 @@ sub packed_bytes {
sub DESTROY { cleanup(@_) }
sub local_nick ($) {
- my ($self) = @_;
- my $ret = '???';
# don't show full FS path, basename should be OK:
- if ($self->{git_dir} =~ m!/([^/]+)(?:/*\.git/*)?\z!) {
- $ret = "$1.git";
- }
- wantarray ? ($ret) : $ret;
+ $_[0]->{git_dir} =~ m!/([^/]+?)(?:/*\.git/*)?\z! ? "$1.git" : '???';
}
sub host_prefix_url ($$) {
@@ -465,7 +460,7 @@ sub pub_urls {
if (my $urls = $self->{cgit_url}) {
return map { host_prefix_url($env, $_) } @$urls;
}
- local_nick($self);
+ (local_nick($self));
}
sub cat_async_begin {
diff --git a/t/git.t b/t/git.t
index fa541f41..08b4a918 100644
--- a/t/git.t
+++ b/t/git.t
@@ -18,7 +18,13 @@ use PublicInbox::Git;
is($?, 0, 'fast-import succeeded');
}
{
- my $git = PublicInbox::Git->new($dir);
+ my $git = PublicInbox::Git->new("$dir/foo.git");
+ my $nick = $git->local_nick; # internal sub
+ unlike($nick, qr/\.git\.git\z/, "no doubled `.git.git' suffix");
+ like($nick, qr/\.git\z/, "one `.git' suffix");
+ $git = PublicInbox::Git->new($dir);
+ $nick = $git->local_nick; # internal sub
+ like($nick, qr/\.git\z/, "local nick always adds `.git' suffix");
my @s = $git->date_parse('1970-01-01T00:00:00Z');
is($s[0], 0, 'parsed epoch');
local $ENV{TZ} = 'UTC';
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] www: coderepo-related cleanups + fixes
@ 2021-10-23 20:19 4% Eric Wong
2021-10-23 20:19 7% ` [PATCH 1/3] git: simplify local_nick, avoid "foo.git.git" Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-10-23 20:19 UTC (permalink / raw)
To: meta
Eric Wong (3):
git: simplify local_nick, avoid "foo.git.git"
config: remove *_url_format support for cgit
www: respect coderepo.*.url during cgit init
lib/PublicInbox/Cgit.pm | 5 +----
lib/PublicInbox/Config.pm | 27 +++++----------------------
lib/PublicInbox/Git.pm | 9 ++-------
t/git.t | 8 +++++++-
4 files changed, 15 insertions(+), 34 deletions(-)
^ permalink raw reply [relevance 4%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-10-23 20:19 4% [PATCH 0/3] www: coderepo-related cleanups + fixes Eric Wong
2021-10-23 20:19 7% ` [PATCH 1/3] git: simplify local_nick, avoid "foo.git.git" Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).