* [PATCH] lei blob: quiet "git rev-parse --git-dir" stderr w/o --cwd
@ 2021-04-12 17:32 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2021-04-12 17:32 UTC (permalink / raw)
To: meta
This seemed to be causing occasional "make check-run" failures
with errors bleeding into other tests.
---
lib/PublicInbox/LeiBlob.pm | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/LeiBlob.pm b/lib/PublicInbox/LeiBlob.pm
index ed0754a3..ad885306 100644
--- a/lib/PublicInbox/LeiBlob.pm
+++ b/lib/PublicInbox/LeiBlob.pm
@@ -23,12 +23,18 @@ sub sol_done { # EOF callback for main daemon
$sol->wq_wait_old(\&sol_done_wait, $lei);
}
-sub get_git_dir ($) {
- my ($d) = @_;
+sub get_git_dir ($$) {
+ my ($lei, $d) = @_;
return $d if -d "$d/objects" && -d "$d/refs" && -e "$d/HEAD";
my $cmd = [ qw(git rev-parse --git-dir) ];
- my ($r, $pid) = popen_rd($cmd, {GIT_DIR => undef}, { '-C' => $d });
+ my $opt = { '-C' => $d };
+ if (defined($lei->{opt}->{cwd})) { # --cwd used, report errors
+ $opt->{2} = $lei->{2};
+ } else { # implicit --cwd, quiet errors
+ open $opt->{2}, '>', '/dev/null' or die "open /dev/null: $!";
+ }
+ my ($r, $pid) = popen_rd($cmd, {GIT_DIR => undef}, $opt);
chomp(my $gd = do { local $/; <$r> });
waitpid($pid, 0) == $pid or die "BUG: waitpid @$cmd ($!)";
$? == 0 ? $gd : undef;
@@ -114,7 +120,7 @@ sub lei_blob {
# maybe it's a non-email (code) blob from a coderepo
my $git_dirs = $opt->{'git-dir'} //= [];
if ($opt->{'cwd'} // 1) {
- my $cgd = get_git_dir('.');
+ my $cgd = get_git_dir($lei, '.');
unshift(@$git_dirs, $cgd) if defined $cgd;
}
return $lei->fail('no --git-dir to try') unless @$git_dirs;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-04-12 17:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-12 17:32 [PATCH] lei blob: quiet "git rev-parse --git-dir" stderr w/o --cwd Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
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).