From: Eric Wong <e@80x24.org>
Date: Tue, 27 Oct 2020 07:54:34 +0000 (+0000)
Subject: v2writable: pass oid to uindex_oid
X-Git-Tag: v1.7.0~1667
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=fe0da19e2917a47d7366a8c67e39a035f6018fd6;p=public-inbox.git

v2writable: pass oid to uindex_oid

We'll be validating against this in the future to stop
bugs from creeping in.
---

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;