diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2009-10-30 20:42:34 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-13 12:20:50 -0800 |
| commit | b4479f074760a788dd4e353b8c86a7d735afc53e (patch) | |
| tree | 5680844fb47dd256945296a8466de81a4bfb17ec /git-add--interactive.perl | |
| parent | 6361824589bc2d32989a9a33f985d09a368436a3 (diff) | |
| download | git-b4479f074760a788dd4e353b8c86a7d735afc53e.tar.gz git-b4479f074760a788dd4e353b8c86a7d735afc53e.tar.xz | |
add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
Use the new "git var GIT_EDITOR" feature to decide what editor to
use, instead of duplicating its logic elsewhere. This should make
the behavior of commands in edge cases (e.g., editor names with
spaces) a little more consistent.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-add--interactive.perl')
| -rwxr-xr-x | git-add--interactive.perl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 69aeaf03e..0c74e5c14 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -987,8 +987,7 @@ sub edit_hunk_manually { EOF close $fh; - my $editor = $ENV{GIT_EDITOR} || $repo->config("core.editor") - || $ENV{VISUAL} || $ENV{EDITOR} || "vi"; + chomp(my $editor = run_cmd_pipe(qw(git var GIT_EDITOR))); system('sh', '-c', $editor.' "$@"', $editor, $hunkfile); if ($? != 0) { |