From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id C70E21F9F3 for ; Sat, 23 Oct 2021 20:19:39 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/3] git: simplify local_nick, avoid "foo.git.git" Date: Sat, 23 Oct 2021 20:19:37 +0000 Message-Id: <20211023201939.27183-2-e@80x24.org> In-Reply-To: <20211023201939.27183-1-e@80x24.org> References: <20211023201939.27183-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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';