lib/PublicInbox/LeiStore.pm | 21 +-------------------- diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm index a17c7bab423d26c90055a54fe6b0fa0731707bdc..f8383d5e5cd91cba83f2b9ddc615927131f11698 100644 --- a/lib/PublicInbox/LeiStore.pm +++ b/lib/PublicInbox/LeiStore.pm @@ -60,24 +60,6 @@ $i =~ /\A(.+) <([^>]+)> [0-9]+ [-\+]?[0-9]+$/ ? ($1, $2) : ('lei user', 'x@example.com') } -# We will support users combining storage across multiple machines -# somehow. Use per-machine refnames to make it easy-to-identify -# where a message came from -sub host_head () { - state $h = do { - my $x = PublicInbox::ExtSearchIdx::host_ident; - # Similar rules found in git.git/remote.c::valid_remote_nick - # and git.git/refs.c::check_refname_component - $x =~ s!(?:\.lock|/)+\z!!gs; # must not end with ".lock" or "/" - $x =~ tr/././s; # no dot-dot, collapse them - $x =~ s/@\{/\@-/gs; - $x =~ s/\A\./-/s; - # no "*", ":", "?", "[", "\", "^", "~", SP, TAB; "]" is OK - $x =~ tr^a-zA-Z0-9!"#$%&'()+,\-.;<=>@]_`{|}^-^c; - $x - }; -} - sub importer { my ($self) = @_; my $max; @@ -96,7 +78,7 @@ $max //= $self->git_epoch_max; while (1) { my $latest = "$pfx/$max.git"; my $old = -e $latest; - PublicInbox::Import::init_bare($latest, host_head); + PublicInbox::Import::init_bare($latest); my $git = PublicInbox::Git->new($latest); $git->qx(qw(config core.sharedRepository 0600)) if !$old; my $packed_bytes = $git->packed_bytes; @@ -110,7 +92,6 @@ $self->{im} = $im = PublicInbox::Import->new($git, $n, $e); $im->{bytes_added} = int($packed_bytes / $self->packing_factor); $im->{lock_path} = undef; $im->{path_type} = 'v2'; - $im->{'ref'} = host_head; return $im; } }