lib/PublicInbox/SearchIdxPart.pm | 7 +++++++
 lib/PublicInbox/V2Writable.pm    | 5 ++++-
 script/public-inbox-index        | 3 +++
 t/v2writable.t                   | 3 +--

diff --git a/lib/PublicInbox/SearchIdxPart.pm b/lib/PublicInbox/SearchIdxPart.pm
index 7fe2120a425488eb0c076aeb35825dd681101081..51d81a0a21560ef73cac1776f5176f8a29df16e0 100644
--- a/lib/PublicInbox/SearchIdxPart.pm
+++ b/lib/PublicInbox/SearchIdxPart.pm
@@ -48,8 +48,15 @@
 sub partition_worker_loop ($$$$) {
 	my ($self, $r, $part, $bnote) = @_;
 	$0 = "pi-v2-partition[$part]";
+	my $current_info = '';
+	my $warn_cb = $SIG{__WARN__} || sub { print STDERR @_ };
+	local $SIG{__WARN__} = sub {
+		chomp $current_info;
+		$warn_cb->("[$part] $current_info: ", @_);
+	};
 	$self->begin_txn_lazy;
 	while (my $line = $r->getline) {
+		$current_info = $line;
 		if ($line eq "commit\n") {
 			$self->commit_txn_lazy;
 		} elsif ($line eq "close\n") {
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 6829a34376105fcd00c1402d0e2a3dbfad7e0b6b..87e8f3eb581a97076b5fd22ea5af917bb623306e 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -72,6 +72,7 @@ 		-inbox => $v2ibx,
 		im => undef, #  PublicInbox::Import
 		parallel => 1,
 		transact_bytes => 0,
+		current_info => '',
 		xpfx => $xpfx,
 		over => PublicInbox::OverIdx->new("$xpfx/over.sqlite3", 1),
 		lock_path => "$dir/inbox.lock",
@@ -949,8 +950,10 @@ 		defined(my $range = $ranges->[$i]) or next;
 		my $fh = $self->{reindex_pipe} = $git->popen(@cmd, $range);
 		my $cmt;
 		while (<$fh>) {
+			chomp;
+			$self->{current_info} = "$i.git $_";
 			if (/\A$x40$/o && !defined($cmt)) {
-				chomp($cmt = $_);
+				$cmt = $_;
 			} elsif (/\A:\d{6} 100644 $x40 ($x40) [AM]\tm$/o) {
 				$self->reindex_oid($mm_tmp, $D, $git, $1,
 						$regen, $reindex);
diff --git a/script/public-inbox-index b/script/public-inbox-index
index 5adb6e741eff8f2578a780bd40738cd7c42ee7a6..2f810a564f01367a592c0862705074e077a193c9 100755
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -85,6 +85,9 @@ "Unable to respect --jobs=$jobs, inbox was created with $n partitions\n";
 				}
 			}
 		}
+		local $SIG{__WARN__} = sub {
+			print STDERR $v2w->{current_info}, ': ', @_;
+		};
 		$v2w->index_sync({ reindex => $reindex, prune => $prune });
 	} else {
 		my $s = PublicInbox::SearchIdx->new($repo, 1);
diff --git a/t/v2writable.t b/t/v2writable.t
index f171417513440fb578382a1471ba3e13544af26c..2826513b0d66057669408f65df02cf5657944df5 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -253,10 +253,9 @@ 	is($im->purge($mime), undef, 'no-op returns undef');
 }
 
 {
-	my @warn;
 	my $x = 'x'x250;
 	my $y = 'y'x250;
-	local $SIG{__WARN__} = sub { push @warn, @_ };
+	local $SIG{__WARN__} = sub {};
 	$mime->header_set('Subject', 'long mid');
 	$mime->header_set('Message-ID', "<$x>");
 	ok($im->add($mime), 'add excessively long Message-ID');