-# 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;
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;
- system("git fast-import --quiet <$fi_data");
+ open my $fh, '<', $fi_data or die
+ "fast-import data readable (or run test at top level: $!";
+ my $rdr = { 0 => $fh };
+ xsys([qw(git fast-import --quiet)], { GIT_DIR => $dir }, $rdr);
is($?, 0, 'fast-import succeeded');
}
}
if (1) {
- my $cmd = [ 'git', "--git-dir=$dir", qw(hash-object -w --stdin) ];
-
# need a big file, use the AGPL-3.0 :p
my $big_data = './COPYING';
ok(-r $big_data, 'COPYING readable');
my $size = -s $big_data;
ok($size > 8192, 'file is big enough');
-
- my $buf = do {
- local $ENV{GIT_DIR} = $dir;
- `git hash-object -w --stdin <$big_data`;
- };
+ open my $fh, '<', $big_data or die;
+ my $cmd = [ 'git', "--git-dir=$dir", qw(hash-object -w --stdin) ];
+ my $buf = xqx($cmd, { GIT_DIR => $dir }, { 0 => $fh });
is(0, $?, 'hashed object successfully');
chomp $buf;
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 => $fh } );
close $fh or die "close failed: $!";