From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Taylor Blau <me@ttaylorr.com>
Subject: [PATCH v2 01/12] send-email: drop FakeTerm hack
Date: Fri, 24 May 2024 12:47:04 -0700 [thread overview]
Message-ID: <20240524194715.695916-2-gitster@pobox.com> (raw)
In-Reply-To: <20240524194715.695916-1-gitster@pobox.com>
From: Jeff King <peff@peff.net>
Back in 280242d1cc (send-email: do not barf when Term::ReadLine does not
like your terminal, 2006-07-02), we added a fallback for when
Term::ReadLine's constructor failed: we'd have a FakeTerm object
instead, which would then die if anybody actually tried to call
readline() on it. Since we instantiated the $term variable at program
startup, we needed this workaround to let the program run in modes when
we did not prompt the user.
But later, in f4dc9432fd (send-email: lazily load modules for a big
speedup, 2021-05-28), we started loading Term::ReadLine lazily only when
ask() is called. So at that point we know we're trying to prompt the
user, and we can just die if ReadLine instantiation fails, rather than
making this fake object to lazily delay showing the error.
This should be OK even if there is no tty (e.g., we're in a cron job),
because Term::ReadLine will return a stub object in that case whose "IN"
and "OUT" functions return undef. And since 5906f54e47 (send-email:
don't attempt to prompt if tty is closed, 2009-03-31), we check for that
case and skip prompting.
And we can be sure that FakeTerm was not kicking in for such a
situation, because it has actually been broken since that commit! It
does not define "IN" or "OUT" methods, so perl would barf with an error.
If FakeTerm was in use, we were neither honoring what 5906f54e47 tried
to do, nor producing the readable message that 280242d1cc intended.
So we're better off just dropping FakeTerm entirely, and letting the
error reported by constructing Term::ReadLine through.
[jc: cherry-picked from v2.42.0-rc2~6^2~1]
Signed-off-by: Jeff King <peff@peff.net>
Acked-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
git-send-email.perl | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 5861e99a6e..72d876f0a0 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -26,18 +26,6 @@
Getopt::Long::Configure qw/ pass_through /;
-package FakeTerm;
-sub new {
- my ($class, $reason) = @_;
- return bless \$reason, shift;
-}
-sub readline {
- my $self = shift;
- die "Cannot use readline on FakeTerm: $$self";
-}
-package main;
-
-
sub usage {
print <<EOT;
git send-email' [<options>] <file|directory>
@@ -930,16 +918,10 @@ sub get_patch_subject {
}
sub term {
- my $term = eval {
- require Term::ReadLine;
- $ENV{"GIT_SEND_EMAIL_NOTTY"}
+ require Term::ReadLine;
+ return $ENV{"GIT_SEND_EMAIL_NOTTY"}
? Term::ReadLine->new('git-send-email', \*STDIN, \*STDOUT)
: Term::ReadLine->new('git-send-email');
- };
- if ($@) {
- $term = FakeTerm->new("$@: going non-interactive");
- }
- return $term;
}
sub ask {
--
2.45.1-246-gb9cfe4845c
next prev parent reply other threads:[~2024-05-24 19:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-24 19:47 [PATCH v2 00/12] Fix various overly aggressive protections in 2.45.1 and friends Junio C Hamano
2024-05-24 19:47 ` Junio C Hamano [this message]
2024-05-24 19:47 ` [PATCH v2 02/12] send-email: avoid creating more than one Term::ReadLine object Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 03/12] ci: drop mention of BREW_INSTALL_PACKAGES variable Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 04/12] ci: avoid bare "gcc" for osx-gcc job Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 05/12] ci: stop installing "gcc-13" for osx-gcc Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 06/12] hook: plug a new memory leak Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 07/12] init: use the correct path of the templates directory again Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 08/12] Revert "core.hooksPath: add some protection while cloning" Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 09/12] tests: verify that `clone -c core.hooksPath=/dev/null` works again Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 10/12] clone: drop the protections where hooks aren't run Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 11/12] Revert "Add a helper function to compare file contents" Junio C Hamano
2024-05-24 19:47 ` [PATCH v2 12/12] Revert "fsck: warn about symlink pointing inside a gitdir" Junio C Hamano
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=20240524194715.695916-2-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
/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 NNTP newsgroup(s).