diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:48:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:48:52 -0800 |
| commit | 376f39fbea0dfb31402abda878a7b0018f6a6161 (patch) | |
| tree | d97dd8a947407fc4c36a97ad7b8b37e6b8142e9e /git-send-email.perl | |
| parent | 7a4383cf13819cd2ef00f0d60318aad3f1813117 (diff) | |
| parent | a3d023d0a3783612053f2149e784b43befceccad (diff) | |
| download | git-376f39fbea0dfb31402abda878a7b0018f6a6161.tar.gz | |
Merge branch 'jn/editor-pager'
* jn/editor-pager:
Provide a build time default-pager setting
Provide a build time default-editor setting
am -i, git-svn: use "git var GIT_PAGER"
add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
Teach git var about GIT_PAGER
Teach git var about GIT_EDITOR
Suppress warnings from "git var -l"
Do not use VISUAL editor on dumb terminals
Handle more shell metacharacters in editor names
Diffstat (limited to 'git-send-email.perl')
| -rwxr-xr-x | git-send-email.perl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index a0279de687..4f5da4ecf2 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -162,7 +162,8 @@ my $compose_filename; # Handle interactive edition of files. my $multiedit; -my $editor = $ENV{GIT_EDITOR} || Git::config(@repo, "core.editor") || $ENV{VISUAL} || $ENV{EDITOR} || "vi"; +my $editor = Git::command_oneline('var', 'GIT_EDITOR'); + sub do_edit { if (defined($multiedit) && !$multiedit) { map { |