X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Fv2writable.t;h=4a7cfb909ee6f3030d722a532a48e7174fad44d9;hb=c34a83286234ea1e876ebdf92a33744272bb6f4e;hp=7abb14f63b10b56f6b7e4e44b1088951322e7882;hpb=0321a1a9e7ae9c9d878d547ee67659ef8aa95689;p=public-inbox.git diff --git a/t/v2writable.t b/t/v2writable.t index 7abb14f6..4a7cfb90 100644 --- a/t/v2writable.t +++ b/t/v2writable.t @@ -210,9 +210,10 @@ EOF my @found = (); $srch->each_smsg_by_mid($smsg->mid, sub { push @found, @_; 1 }); is(scalar(@found), 0, 'no longer found in Xapian skeleton'); + my @log1 = qw(log -1 --pretty=raw --raw -r --no-abbrev --no-renames); - my $after = $git0->qx(qw(log -1 --pretty=raw --raw -r --no-abbrev)); - if ($after =~ m!( [a-f0-9]+ )A\t_/D$!) { + my $after = $git0->qx(@log1); + if ($after =~ m!( [a-f0-9]+ )A\td$!m) { my $oid = $1; ok(index($before, $oid) > 0, 'no new blob introduced'); } else { @@ -221,7 +222,7 @@ EOF is($im->remove($mime, 'test removal'), undef, 'remove is idempotent'); $im->done; - is($git0->qx(qw(log -1 --pretty=raw --raw -r --no-abbrev)), + is($git0->qx(@log1), $after, 'no git history made with idempotent remove'); eval { $im->done }; ok(!$@, '->done is idempotent');