X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fgit.t;h=56fc8d953f01d548b2f67e6655d3b06214f5ed1f;hb=refs%2Fheads%2Fmaster;hp=fa541f41179fad34a033309ed25e51570cfd0f78;hpb=83e7e8640ed8ce72f40771a52010ab996b07e5a2;p=public-inbox.git

diff --git a/t/git.t b/t/git.t
index fa541f41..dfa5eab2 100644
--- a/t/git.t
+++ b/t/git.t
@@ -1,7 +1,8 @@
-# Copyright (C) 2015-2021 all contributors <meta@public-inbox.org>
+#!perl -w
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
-use Test::More;
+use v5.10.1;
 use PublicInbox::TestCommon;
 my ($dir, $for_destroy) = tmpdir();
 use PublicInbox::Import;
@@ -9,7 +10,7 @@ use POSIX qw(strftime);
 use PublicInbox::Git;
 
 {
-	PublicInbox::Import::init_bare($dir);
+	PublicInbox::Import::init_bare($dir, 'master');
 	my $fi_data = './t/git.fast-import-data';
 	open my $fh, '<', $fi_data or die
 		"fast-import data readable (or run test at top level: $!";
@@ -18,7 +19,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';
@@ -38,7 +45,7 @@ use PublicInbox::Git;
 	my $f = 'HEAD:foo.txt';
 	my @x = $gcf->check($f);
 	is(scalar @x, 3, 'returned 3 element array for existing file');
-	like($x[0], qr/\A[a-f0-9]{40}\z/, 'returns obj ID in 1st element');
+	like($x[0], qr/\A[a-f0-9]{40,64}\z/, 'returns obj ID in 1st element');
 	is('blob', $x[1], 'returns obj type in 2nd element');
 	like($x[2], qr/\A\d+\z/, 'returns obj size in 3rd element');
 
@@ -128,7 +135,7 @@ if (1) {
 }
 
 SKIP: {
-	require_git(2.6, 7) or skip('need git 2.6+ for --batch-all-objects', 7);
+	require_git(2.6, 7);
 	my ($alt, $alt_obj) = tmpdir();
 	my $hash_obj = [ 'git', "--git-dir=$alt", qw(hash-object -w --stdin) ];
 	PublicInbox::Import::init_bare($alt);