diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2009-11-11 17:56:07 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-13 12:15:28 -0800 |
| commit | d33738d7d3ed42a956c74d0125eb2b3abda451b7 (patch) | |
| tree | 414fdfcc1767201d02b06169857ba3db182ccebf /t/t7005-editor.sh | |
| parent | eab58f1e8e5ef86b5075ce6dfcd6d3f1b3b888b3 (diff) | |
| download | git-d33738d7d3ed42a956c74d0125eb2b3abda451b7.tar.gz git-d33738d7d3ed42a956c74d0125eb2b3abda451b7.tar.xz | |
Do not use VISUAL editor on dumb terminals
Refuse to use $VISUAL and fall back to $EDITOR if TERM is unset
or set to "dumb". Traditionally, VISUAL is set to a screen
editor and EDITOR to a line-based editor, which should be more
useful in that situation.
vim, for example, is happy to assume a terminal supports ANSI
sequences even if TERM is dumb (e.g., when running from a text
editor like Acme). git already refuses to fall back to vi on a
dumb terminal if GIT_EDITOR, core.editor, VISUAL, and EDITOR are
unset, but without this patch, that check is suppressed by
VISUAL=vi.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7005-editor.sh')
| -rwxr-xr-x | t/t7005-editor.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh index b647957d7..a95fe19d8 100755 --- a/t/t7005-editor.sh +++ b/t/t7005-editor.sh @@ -42,6 +42,16 @@ test_expect_success 'dumb should error out when falling back on vi' ' fi ' +test_expect_success 'dumb should prefer EDITOR to VISUAL' ' + + EDITOR=./e-EDITOR.sh && + VISUAL=./e-VISUAL.sh && + export EDITOR VISUAL && + git commit --amend && + test "$(git show -s --format=%s)" = "Edited by EDITOR" + +' + TERM=vt100 export TERM for i in vi EDITOR VISUAL core_editor GIT_EDITOR |