diff options
author | Eric Wong <e@80x24.org> | 2020-10-27 07:54:34 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2020-11-07 10:21:47 +0000 |
commit | fe0da19e2917a47d7366a8c67e39a035f6018fd6 (patch) | |
tree | c50b2bfb8a7ff649d2c9af3a6131eee90d3aaad5 /lib | |
parent | f639808a88bba0e93ee4782d2b7ab0b1e30ac838 (diff) | |
download | public-inbox-fe0da19e2917a47d7366a8c67e39a035f6018fd6.tar.gz |
We'll be validating against this in the future to stop bugs from creeping in.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/PublicInbox/V2Writable.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index c8b01a3d..efda7907 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -1073,12 +1073,12 @@ sub sync_prepare ($$) { # our code and blindly injects "d" file history into git repos if (my @leftovers = keys %{delete($sync->{D}) // {}}) { warn('W: unindexing '.scalar(@leftovers)." leftovers\n"); - my $arg = { self => $self }; my $unindex_oid = $self->can('unindex_oid'); for my $oid (@leftovers) { $oid = unpack('H*', $oid); $self->{current_info} = "leftover $oid"; - $self->git->cat_async($oid, $unindex_oid, $arg); + my $req = { %$sync, oid => $oid }; + $self->git->cat_async($oid, $unindex_oid, $req); } $self->git->cat_async_wait; } @@ -1151,7 +1151,7 @@ sub unindex_todo ($$$) { my $unindex_oid = $self->can('unindex_oid'); while (<$fh>) { /\A:\d{6} 100644 $OID ($OID) [AM]\tm$/o or next; - $self->git->cat_async($1, $unindex_oid, $sync); + $self->git->cat_async($1, $unindex_oid, { %$sync, oid => $1 }); } close $fh or die "git log failed: \$?=$?"; $self->git->cat_async_wait; |