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 5/6] git: manifest_entry: use ProcessPipe via popen_rd
Date: Fri,  1 Jan 2021 19:13:43 -1400	[thread overview]
Message-ID: <20210102091344.13477-6-e@80x24.org> (raw)
In-Reply-To: <20210102091344.13477-1-e@80x24.org>

Only saves us one line of code, but that's better than nothing.
---
 lib/PublicInbox/Git.pm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index cdd2b400..3d97300c 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -507,14 +507,13 @@ sub modified ($) {
 # templates/this--description in git.git
 sub manifest_entry {
 	my ($self, $epoch, $default_desc) = @_;
-	my ($fh, $pid) = $self->popen('show-ref');
+	my $fh = $self->popen('show-ref');
 	my $dig = Digest::SHA->new(1);
 	while (read($fh, my $buf, 65536)) {
 		$dig->add($buf);
 	}
-	close $fh;
-	waitpid($pid, 0);
-	return if $?; # empty, uninitialized git repo
+	close $fh or return; # empty, uninitialized git repo
+	undef $fh; # for open, below
 	my $git_dir = $self->{git_dir};
 	my $ent = {
 		fingerprint => $dig->hexdigest,

  parent reply	other threads:[~2021-01-02  9:13 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-02  9:13 [PATCH 0/6] process pipe improvements Eric Wong
2021-01-02  9:13 ` [PATCH 1/6] processpipe: allow synchronous close to set $? Eric Wong
2021-01-02  9:13 ` [PATCH 2/6] processpipe: lazy-require PublicInbox::DS for dwaitpid Eric Wong
2021-01-02  9:13 ` [PATCH 3/6] git: qx: waitpid synchronously via ProcessPipe->CLOSE Eric Wong
2021-01-02  9:13 ` [PATCH 4/6] import: switch to using ProcessPipe Eric Wong
2021-01-02  9:13 ` Eric Wong [this message]
2021-01-02  9:13 ` [PATCH 6/6] qspawn: switch to ProcessPipe via popen_rd Eric Wong

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=20210102091344.13477-6-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).