From: Jonathan Nieder <jrnieder@gmail.com>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Marc Kleine-Budde <m.kleine-budde@pengutronix.de>,
Jay Soffian <jaysoffian@gmail.com>
Subject: [PATCH] send-email: do not check for editor until needed
Date: Mon, 22 Mar 2010 18:25:31 -0500 [thread overview]
Message-ID: <20100322232531.GA2168@progeny.tock> (raw)
In-Reply-To: <20100322145947.GA1709@pengutronix.de>
Since b4479f074 (add -i, send-email, svn, p4, etc: use "git var
GIT_EDITOR", 2009-10-30), when called with TERM=dumb and without
GIT_EDITOR set, git send-email has been failing whether it needs
an editor or not:
$ ssh localhost git send-email --to=me --suppress-cc=all HEAD^..HEAD
fatal: Terminal is dumb, but EDITOR unset
var GIT_EDITOR: command returned error: 128
This breaks use of git send-email in existing hook scripts.
So do not check for an editor unless it is needed.
Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Uwe Kleine-König wrote:
> since b4479f074760a788dd4e353b8c86a7d735afc53e git send-email (and
> others) use git var GIT_EDITOR. This is OK as such but it breaks the
> post-receive hooks that I use on several repositories.
[...]
> IMHO git send-email should only call $(git var GIT_EDITOR) when it
> actually needs it.
Thanks for reporting. Does this patch work for you?
Now if I try without a tty, I get a different error:
$ ssh localhost cd $(pwd) '&&' \
git send-email --to=me --suppress-cc=all HEAD^..HEAD
Can't locate object method "IN" via package "FakeTerm" at
/home/jrn/tmp-git/libexec/git-core/git-send-email line 645.
/tmp/olTiwjzrjx/0001-Git-1.7.0.3.patch
I assume I am not using it correctly, since the relevant code has
been around for a while.
git-send-email.perl | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index e05455f..9406cdd 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -162,9 +162,16 @@ my $compose_filename;
# Handle interactive edition of files.
my $multiedit;
-my $editor = Git::command_oneline('var', 'GIT_EDITOR');
sub do_edit {
+ my $editor;
+
+ if ($#_ == 0) {
+ return;
+ }
+ git_cmd_try {
+ $editor = Git::command_oneline('var', 'GIT_EDITOR');
+ } "no suitable text editor configured\n";
if (defined($multiedit) && !$multiedit) {
map {
system('sh', '-c', $editor.' "$@"', $editor, $_);
--
1.7.0.2
next prev parent reply other threads:[~2010-03-22 23:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-22 14:59 [REGRESSION] git var GIT_EDITOR fails without tty Uwe Kleine-König
2010-03-22 16:12 ` [PATCH] send-email: lazily assign editor variable Michael J Gruber
2010-03-22 16:41 ` Uwe Kleine-König
2010-03-23 0:58 ` Jonathan Nieder
2010-03-23 10:56 ` Michael J Gruber
2010-03-24 17:52 ` Junio C Hamano
2010-03-25 5:17 ` Jonathan Nieder
2010-03-26 19:32 ` Junio C Hamano
2010-03-26 21:45 ` Jonathan Nieder
2010-03-25 8:03 ` Michael J Gruber
2010-03-26 19:32 ` Junio C Hamano
2010-03-22 23:25 ` Jonathan Nieder [this message]
2010-03-23 9:15 ` [PATCH] send-email: do not check for editor until needed Peter Kjellerstedt
2010-03-23 19:25 ` Jonathan Nieder
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://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100322232531.GA2168@progeny.tock \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jaysoffian@gmail.com \
--cc=m.kleine-budde@pengutronix.de \
--cc=u.kleine-koenig@pengutronix.de \
/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/mirrors/git.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).