[PATCH] send-email: lazily assign editor variable
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Mar 22, 2010, 16:12 UTC
- Message-ID
- <eb0d92cf28820eb9783e789a8c4c62c3af4dd0d0.1269274203.git.git@drmicha.warpmail.net>
- In-Reply-To
- <20100322145947.GA1709@pengutronix.de>
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