dumping ground for random patches and texts
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 7/8] import: use run_qx
Date: Fri, 27 Oct 2023 01:14:42 +0000	[thread overview]
Message-ID: <20231027011443.3709841-7-e@80x24.org> (raw)
In-Reply-To: <20231027011443.3709841-1-e@80x24.org>

---
 lib/PublicInbox/Import.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index fb70b91b..6eee8774 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -8,7 +8,7 @@
 package PublicInbox::Import;
 use v5.12;
 use parent qw(PublicInbox::Lock);
-use PublicInbox::Spawn qw(run_die popen_rd spawn);
+use PublicInbox::Spawn qw(run_die run_qx spawn);
 use PublicInbox::MID qw(mids mid2path);
 use PublicInbox::Address;
 use PublicInbox::Smsg;
@@ -25,10 +25,8 @@ use PublicInbox::Git qw(read_all);
 
 sub default_branch () {
 	state $default_branch = do {
-		my $r = popen_rd([qw(git config --global init.defaultBranch)],
+		my $h = run_qx([qw(git config --global init.defaultBranch)],
 				 { GIT_CONFIG => undef });
-		chomp(my $h = <$r> // '');
-		CORE::close $r;
 		$h eq '' ? 'refs/heads/master' : "refs/heads/$h";
 	}
 }

  parent reply	other threads:[~2023-10-27  1:14 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-27  1:14 [PATCH 1/8] lei: don't exit lei-daemon on ovv_begin failure Eric Wong
2023-10-27  1:14 ` [PATCH 2/8] spawn: croak directly in C pi_fork_exec Eric Wong
2023-10-27  1:14 ` [PATCH 3/8] spawnpp: use autodie for syscall failures Eric Wong
2023-10-27  1:14 ` [PATCH 4/8] spawn: avoid alloca in C pi_fork_exec Eric Wong
2023-10-27  1:14 ` [PATCH 5/8] git: use run_qx to read `git --version' Eric Wong
2023-10-27  1:14 ` [PATCH 6/8] git: avoid extra stat(2) for git version Eric Wong
2023-10-27  1:14 ` Eric Wong [this message]
2023-10-27  1:14 ` [PATCH 8/8] treewide: use ->close method rather than CORE::close 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231027011443.3709841-7-e@80x24.org \
    --to=e@80x24.org \
    --cc=spew@80x24.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).