From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] lei_store: alternative unconfigured "git var" workaround
Date: Sat, 2 Jan 2021 08:32:04 +0000 [thread overview]
Message-ID: <20210102083204.28693-1-e@80x24.org> (raw)
While the changes to git->qx/git->popen from commit 171a9c24022ad7ef
will be useful for the lei daemon, hiding git error messages from
actual users is probably wrong and we'll just localize GIT_*
vars for testing.
---
lib/PublicInbox/LeiStore.pm | 4 +---
t/lei.t | 2 ++
t/lei_store.t | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index 7c62ffea..a23efed5 100644
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -54,9 +54,7 @@ sub git_epoch_max {
sub git_ident ($) {
my ($git) = @_;
- open my $null, '>', '/dev/null' or die "open /dev/null: $!";
- my $opt = { 2 => $null };
- chomp(my $i = $git->qx(qw(var GIT_COMMITTER_IDENT), undef, $opt));
+ chomp(my $i = $git->qx(qw(var GIT_COMMITTER_IDENT)));
warn "$git->{git_dir} GIT_COMMITTER_IDENT failed\n" if $?;
$i =~ /\A(.+) <([^>]+)> [0-9]+ [-\+]?[0-9]+$/ ? ($1, $2) :
('lei user', 'x@example.com')
diff --git a/t/lei.t b/t/lei.t
index 690878ce..5ad82f5d 100644
--- a/t/lei.t
+++ b/t/lei.t
@@ -24,6 +24,8 @@ my $lei = sub {
my ($home, $for_destroy) = tmpdir();
delete local $ENV{XDG_DATA_HOME};
delete local $ENV{XDG_CONFIG_HOME};
+local $ENV{GIT_COMMITTER_EMAIL} = 'lei@example.com';
+local $ENV{GIT_COMMITTER_NAME} = 'lei user';
local $ENV{XDG_RUNTIME_DIR} = "$home/xdg_run";
local $ENV{HOME} = $home;
local $ENV{FOO} = 'BAR';
diff --git a/t/lei_store.t b/t/lei_store.t
index bcebde8e..c9360f8f 100644
--- a/t/lei_store.t
+++ b/t/lei_store.t
@@ -12,6 +12,8 @@ require_ok 'PublicInbox::ExtSearch';
my ($home, $for_destroy) = tmpdir();
my $opt = { 1 => \(my $out = ''), 2 => \(my $err = '') };
my $store_dir = "$home/lst";
+local $ENV{GIT_COMMITTER_EMAIL} = 'lei@example.com';
+local $ENV{GIT_COMMITTER_NAME} = 'lei user';
my $lst = PublicInbox::LeiStore->new($store_dir, { creat => 1 });
ok($lst, '->new');
my $smsg = $lst->add_eml(eml_load('t/data/0001.patch'));
reply other threads:[~2021-01-02 8: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: http://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=20210102083204.28693-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.
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).