[PATCH] send-email: lazily assign editor variable

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Michael J Gruber
Date: Monday, March 22, 2010 - 9:12 am

b4479f0 (add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR",
2009-10-30) introduced the use of git var GIT_EDITOR which may lead to
problems when send-mail is used without a tty.

Therefore, use git var GIT_EDITOR only when we actually edit something.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 git-send-email.perl |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/git-send-email.perl b/git-send-email.perl
index d612ae8..bb09c0d 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -162,9 +162,12 @@ my $compose_filename;
 
 # Handle interactive edition of files.
 my $multiedit;
-my $editor = Git::command_oneline('var', 'GIT_EDITOR');
+my $editor;
 
 sub do_edit {
+	if (!defined($editor)) {
+		$editor = Git::command_oneline('var', 'GIT_EDITOR');
+	}
 	if (defined($multiedit) && !$multiedit) {
 		map {
 			system('sh', '-c', $editor.' "$@"', $editor, $_);
-- 
1.7.0.3.435.g097f4

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[REGRESSION] git var GIT_EDITOR fails without tty, Uwe =?iso-8859-1?Q?K ..., (Mon Mar 22, 7:59 am)
[PATCH] send-email: lazily assign editor variable, Michael J Gruber, (Mon Mar 22, 9:12 am)
Re: [PATCH] send-email: lazily assign editor variable, Uwe =?iso-8859-1?Q?K ..., (Mon Mar 22, 9:41 am)
[PATCH] send-email: do not check for editor until needed, Jonathan Nieder, (Mon Mar 22, 4:25 pm)
Re: [PATCH] send-email: lazily assign editor variable, Jonathan Nieder, (Mon Mar 22, 5:58 pm)
RE: [PATCH] send-email: do not check for editor until needed, Peter Kjellerstedt, (Tue Mar 23, 2:15 am)
Re: [PATCH] send-email: lazily assign editor variable, Michael J Gruber, (Tue Mar 23, 3:56 am)
Re: [PATCH] send-email: do not check for editor until needed, Jonathan Nieder, (Tue Mar 23, 12:25 pm)
Re: [PATCH] send-email: lazily assign editor variable, Junio C Hamano, (Wed Mar 24, 10:52 am)
Re: [PATCH] send-email: lazily assign editor variable, Jonathan Nieder, (Wed Mar 24, 10:17 pm)
Re: [PATCH] send-email: lazily assign editor variable, Michael J Gruber, (Thu Mar 25, 1:03 am)
Re: [PATCH] send-email: lazily assign editor variable, Junio C Hamano, (Fri Mar 26, 12:32 pm)
Re: [PATCH] send-email: lazily assign editor variable, Junio C Hamano, (Fri Mar 26, 12:32 pm)
Re: [PATCH] send-email: lazily assign editor variable, Jonathan Nieder, (Fri Mar 26, 2:45 pm)