From 30a72ab33290a9ce57955bbd0799e394feab91ea Mon Sep 17 00:00:00 2001
From: "Eric Wong (Contractor, The Linux Foundation)" <e@80x24.org>
Date: Sat, 3 Mar 2018 20:33:25 +0000
Subject: import: consolidate object info for v2 imports

It's easier to store everything in one array ref similar
to what our Git->check routine returns
---
 lib/PublicInbox/Import.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/PublicInbox/Import.pm')

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index ac46c0cb..ddb63b10 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -282,9 +282,9 @@ sub add {
 	print $w $str, "\n" or wfail;
 
 	# v2: we need this for Xapian
-	if ($self->{want_object_id}) {
-		chomp($self->{last_object_id} = $self->get_mark(":$blob"));
-		$self->{last_object} = [ $n, \$str ];
+	if ($self->{want_object_info}) {
+		chomp(my $oid = $self->get_mark(":$blob"));
+		$self->{last_object} = [ $oid, $n, \$str ];
 	}
 	my $ref = $self->{ref};
 	my $commit = $self->{mark}++;
-- 
cgit v1.2.3-24-ge0c7