X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchIdx.pm;h=33c81ea87d4135a6f320c46e41993b1b8ad4de57;hb=9ed4b47f4e245a08e42cc946235808a73fbc1aef;hp=d3c904c761db3f3378cdb409095c824a9593d4bb;hpb=e0ee07820a1b580ee1b755c9f9ec3c87e00727d9;p=public-inbox.git diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm index d3c904c7..33c81ea8 100644 --- a/lib/PublicInbox/SearchIdx.pm +++ b/lib/PublicInbox/SearchIdx.pm @@ -736,11 +736,11 @@ sub process_stack { v1_checkpoint($self, $sync, $stk); } -sub log2stack ($$$$) { - my ($sync, $git, $range, $ibx) = @_; +sub log2stack ($$$) { + my ($sync, $git, $range) = @_; my $D = $sync->{D}; # OID_BIN => NR (if reindexing, undef otherwise) my ($add, $del); - if ($ibx->version == 1) { + if ($sync->{ibx}->version == 1) { my $path = $hex.'{2}/'.$hex.'{38}'; $add = qr!\A:000000 100644 \S+ ($OID) A\t$path$!; $del = qr!\A:100644 000000 ($OID) \S+ D\t$path$!; @@ -796,7 +796,7 @@ sub prepare_stack ($$) { return PublicInbox::IdxStack->new->read_prepare if $?; } $sync->{D} = $sync->{reindex} ? {} : undef; # OID_BIN => NR - log2stack($sync, $git, $range, $sync->{ibx}); + log2stack($sync, $git, $range); } # --is-ancestor requires git 1.8.0+