about summary refs log tree commit homepage
path: root/lib/PublicInbox/LeiStore.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2020-12-31 13:51:21 +0000
committerEric Wong <e@80x24.org>2021-01-01 05:00:38 +0000
commit7d36c23938cddd2ce5baabe3ee5b7a579378aaba (patch)
tree7e5db7167e44f2f7b797e97438fbe5d96b025a48 /lib/PublicInbox/LeiStore.pm
parent46632639a56dfca600d103f548b561316fc8b326 (diff)
downloadpublic-inbox-7d36c23938cddd2ce5baabe3ee5b7a579378aaba.tar.gz
In retrospect, per-machine HEADs was a bad idea because users
of removable storage would be thrown off when moving storage
between different machines.

This is only a partial revert, the Import::init_bare change to
support alternate head names still exists because we may use it
for other reasons.
Diffstat (limited to 'lib/PublicInbox/LeiStore.pm')
-rw-r--r--lib/PublicInbox/LeiStore.pm21
1 files changed, 1 insertions, 20 deletions
diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index a17c7bab..f8383d5e 100644
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -60,24 +60,6 @@ sub git_ident ($) {
                 ('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 @@ sub importer {
         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 @@ sub importer {
                 $im->{bytes_added} = int($packed_bytes / $self->packing_factor);
                 $im->{lock_path} = undef;
                 $im->{path_type} = 'v2';
-                $im->{'ref'} = host_head;
                 return $im;
         }
 }