unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] lei blob: quiet "git rev-parse --git-dir" stderr w/o --cwd
Date: Mon, 12 Apr 2021 17:32:20 +0000	[thread overview]
Message-ID: <20210412173220.16023-1-e@80x24.org> (raw)

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;

                 reply	other threads:[~2021-04-12 17:32 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=20210412173220.16023-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).