gcf2: require git dir with OID

[public-inbox.git] / script / public-inbox-gcf2

diff --git a/script/public-inbox-gcf2 b/script/public-inbox-gcf2
index d2d2ac8bd828340c76194e426c7d0b7b2b9849db..4a44b654efe0bedd62939834599d38f4eb25b832 100755 (executable)
--- a/script/public-inbox-gcf2
+++ b/script/public-inbox-gcf2
@@ -3,7 +3,6 @@
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 eval { require PublicInbox::Gcf2 };
 die "libgit2 development package or Inline::C missing for $0: $@\n" if $@;
-my @dirs; # may get big (30K-100K)
 my $gcf2 = PublicInbox::Gcf2::new();
 use IO::Handle; # autoflush
 STDERR->autoflush(1);
@@ -11,19 +10,16 @@ STDOUT->autoflush(1);
 
 while (<STDIN>) {
        chomp;
-       if (m!\A/!) { # +/path/to/git-dir
-               push @dirs, $_;
-               $gcf2->add_alternate("$_/objects");
-       } elsif (!$gcf2->cat_oid(1, $_)) {
+       my ($oid, $git_dir) = split(/ /, $_, 2);
+       $gcf2->add_alternate("$git_dir/objects");
+       if (!$gcf2->cat_oid(1, $oid)) {
                # retry once if missing.  We only get unabbreviated OIDs
                # from SQLite or Xapian DBs, here, so malicious clients
                # can't trigger excessive retries:
-               my $oid = $_;
-               warn "I: $$ $oid missing, retrying...\n";
+               warn "I: $$ $oid missing, retrying in $git_dir...\n";
 
-               # clients may need to wait a bit for this:
                $gcf2 = PublicInbox::Gcf2::new();
-               $gcf2->add_alternate("$_/objects") for @dirs;
+               $gcf2->add_alternate("$git_dir/objects");
 
                if ($gcf2->cat_oid(1, $oid)) {
                        warn "I: $$ $oid found after retry\n";