use Cwd qw(abs_path);
require_git(2.6);
use PublicInbox::ContentHash qw(git_sha);
-use PublicInbox::Spawn qw(popen_rd which);
+use PublicInbox::Spawn qw(popen_rd);
require_mods(qw(DBD::SQLite Search::Xapian Plack::Util));
my $git_dir = xqx([qw(git rev-parse --git-dir)], undef, {2 => \(my $null)});
$? == 0 or plan skip_all => "$0 must be run from a git working tree";
is($lei_out, $patch2->as_string, 'blob matches');
ok(!lei('blob', '--mail', '69df7d5', '-I', $ibx->{inboxdir}),
"--mail won't run solver");
+ like($lei_err, qr/\b69df7d5\b/, 'OID in error by git(1)');
lei_ok('blob', '69df7d5', '-I', $ibx->{inboxdir});
is(git_sha(1, \$lei_out)->hexdigest, $expect, 'blob contents output');
is($lei_out, $prev, '--no-mail works');
ok(!lei(qw(blob -I), $ibx->{inboxdir}, $non_existent),
'non-existent blob fails');
+ my $abbrev = substr($non_existent, 0, 7);
+ like($lei_err, qr/could not find $abbrev/, 'failed abbreviation noted');
SKIP: {
skip '/.git exists', 1 if -e '/.git';
lei_ok(qw(-C / blob 69df7d5 -I), $ibx->{inboxdir},
ok(!lei(qw(-C / blob --no-cwd 69df7d5 -I), $ibx->{inboxdir}),
'--no-cwd works');
+ like($lei_err, qr/no --git-dir to try/,
+ 'lack of --git-dir noted');
ok(!lei(qw(-C / blob -I), $ibx->{inboxdir}, $non_existent),
'non-existent blob fails');
+ like($lei_err, qr/no --git-dir to try/,
+ 'lack of --git-dir noted');
}
# fallbacks
@@ -1,13 +1,12 @@
#!perl -w
EOM
- ok(index($lei_out, $exp) >= 0,
+ like($lei_out, qr/\Q$exp\E/,
'preserve mode, regen header + context from -U0 patch');
my $e = { GIT_DIR => "$ENV{HOME}/.local/share/lei/store/ALL.git" };
my @x = xqx([qw(git cat-file --batch-all-objects --batch-check)], $e);
my $url = "http://$h:$p";
local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = $url;
Plack::Test::ExternalServer::test_psgi(client => $client);
- skip 'no curl', 1 unless which('curl');
+ require_cmd('curl', 1) or skip 'no curl', 1;
mkdir "$tmpdir/ext" // xbail "mkdir $!";
test_lei({tmpdir => "$tmpdir/ext"}, sub {