From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] lei blob: fix attachment extraction for unimported||inflight
Date: Thu, 11 Apr 2024 18:58:26 +0000 [thread overview]
Message-ID: <20240411185826.2564743-1-e@80x24.org> (raw)
Noticed while trying to make other reliability improvements to
lei...
---
lib/PublicInbox/LeiBlob.pm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/LeiBlob.pm b/lib/PublicInbox/LeiBlob.pm
index 127cc81e..00697097 100644
--- a/lib/PublicInbox/LeiBlob.pm
+++ b/lib/PublicInbox/LeiBlob.pm
@@ -119,14 +119,17 @@ sub lei_blob {
} else {
open $rdr->{2}, '>', '/dev/null' or die "open: $!";
}
- my $cmd = [ 'git', '--git-dir='.$lei->ale->git->{git_dir},
- 'cat-file', 'blob', $blob ];
+ my $cmd = $lei->ale->git->cmd('cat-file', 'blob', $blob);
+ my $cerr;
if (defined $lei->{-attach_idx}) {
my $buf = run_qx($cmd, $lei->{env}, $rdr);
return extract_attach($lei, $blob, \$buf) unless $?;
+ $cerr = $?;
+ } else {
+ $rdr->{1} = $lei->{1}; # write directly to client
+ $cerr = run_wait($cmd, $lei->{env}, $rdr) or return;
}
- $rdr->{1} = $lei->{1};
- my $cerr = run_wait($cmd, $lei->{env}, $rdr) or return;
+ # fall back to unimported ('lei index') and inflight blobs
my $lms = $lei->lms;
my $bref = ($lms ? $lms->local_blob($blob, 1) : undef) // do {
my $sto = $lei->{sto} // $lei->_lei_store;
reply other threads:[~2024-04-11 18:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240411185826.2564743-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).