import: init_bare: allow use as method, use in tests

[public-inbox.git] / t / git.t

diff --git a/t/git.t b/t/git.t
index 6cfadd085f20d82c46c47c015da870b1e74476e9..0936ac5ea8d1420641afd00c4586cd95ceaddc0a 100644 (file)
--- a/t/git.t
+++ b/t/git.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -6,11 +6,12 @@ use Test::More;
 use PublicInbox::TestCommon;
 my ($dir, $for_destroy) = tmpdir();
 use PublicInbox::Spawn qw(popen_rd);
+use PublicInbox::Import;
 
 use_ok 'PublicInbox::Git';
 
 {
-       is(system(qw(git init -q --bare), $dir), 0, 'created git directory');
+       PublicInbox::Import::init_bare($dir);
        my $fi_data = './t/git.fast-import-data';
        ok(-r $fi_data, "fast-import data readable (or run test at top level)");
        local $ENV{GIT_DIR} = $dir;
@@ -90,9 +91,9 @@ if (1) {
 if ('alternates reloaded') {
        my ($alt, $alt_obj) = tmpdir();
        my @cmd = ('git', "--git-dir=$alt", qw(hash-object -w --stdin));
-       is(system(qw(git init -q --bare), $alt), 0, 'create alt directory');
+       PublicInbox::Import::init_bare($alt);
        open my $fh, '<', "$alt/config" or die "open failed: $!\n";
-       my $rd = popen_rd(\@cmd, {}, { 0 => fileno($fh) } );
+       my $rd = popen_rd(\@cmd, {}, { 0 => $fh } );
        close $fh or die "close failed: $!";
        chomp(my $remote = <$rd>);
        my $gcf = PublicInbox::Git->new($dir);