mirror of
https://github.com/git-for-windows/git.git
synced 2026-02-04 03:33:01 -06:00
83d64df8d5
Tests in t7005 mask Git error codes and do not use our nice test helpers. Improve that, move some code into the setup test, and drop a few old-style blank lines while at it. Best-viewed-with: --ignore-all-space Signed-off-by: D. Ben Knoble <ben.knoble+github@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
108 lines
2.1 KiB
Bash
Executable File
108 lines
2.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='GIT_EDITOR, core.editor, and stuff'
|
|
|
|
. ./test-lib.sh
|
|
|
|
unset EDITOR VISUAL GIT_EDITOR
|
|
|
|
test_expect_success 'determine default editor' '
|
|
vi=$(TERM=vt100 git var GIT_EDITOR) &&
|
|
test -n "$vi"
|
|
'
|
|
|
|
test_expect_success setup '
|
|
if ! expr "$vi" : "[a-z]*$" >/dev/null
|
|
then
|
|
vi=
|
|
fi &&
|
|
|
|
for i in GIT_EDITOR core_editor EDITOR VISUAL $vi
|
|
do
|
|
write_script e-$i.sh <<-EOF || return 1
|
|
echo "Edited by $i" >"\$1"
|
|
EOF
|
|
done &&
|
|
|
|
if ! test -z "$vi"
|
|
then
|
|
mv e-$vi.sh $vi
|
|
fi &&
|
|
|
|
msg="Hand-edited" &&
|
|
test_commit "$msg" &&
|
|
test_commit_message HEAD -m "$msg"
|
|
'
|
|
|
|
TERM=dumb
|
|
export TERM
|
|
test_expect_success 'dumb should error out when falling back on vi' '
|
|
test_must_fail git commit --amend
|
|
'
|
|
|
|
test_expect_success 'dumb should prefer EDITOR to VISUAL' '
|
|
EDITOR=./e-EDITOR.sh &&
|
|
VISUAL=./e-VISUAL.sh &&
|
|
export EDITOR VISUAL &&
|
|
git commit --amend &&
|
|
test_commit_message HEAD -m "Edited by EDITOR"
|
|
'
|
|
|
|
TERM=vt100
|
|
export TERM
|
|
for i in $vi EDITOR VISUAL core_editor GIT_EDITOR
|
|
do
|
|
echo "Edited by $i" >expect
|
|
unset EDITOR VISUAL GIT_EDITOR
|
|
git config --unset-all core.editor
|
|
case "$i" in
|
|
core_editor)
|
|
git config core.editor ./e-core_editor.sh
|
|
;;
|
|
[A-Z]*)
|
|
eval "$i=./e-$i.sh"
|
|
export $i
|
|
;;
|
|
esac
|
|
test_expect_success "Using $i" '
|
|
git --exec-path=. commit --amend &&
|
|
test_commit_message HEAD expect
|
|
'
|
|
done
|
|
|
|
unset EDITOR VISUAL GIT_EDITOR
|
|
git config --unset-all core.editor
|
|
for i in $vi EDITOR VISUAL core_editor GIT_EDITOR
|
|
do
|
|
echo "Edited by $i" >expect
|
|
case "$i" in
|
|
core_editor)
|
|
git config core.editor ./e-core_editor.sh
|
|
;;
|
|
[A-Z]*)
|
|
eval "$i=./e-$i.sh"
|
|
export $i
|
|
;;
|
|
esac
|
|
test_expect_success "Using $i (override)" '
|
|
git --exec-path=. commit --amend &&
|
|
test_commit_message HEAD expect
|
|
'
|
|
done
|
|
|
|
test_expect_success 'editor with a space' '
|
|
echo "echo space >\"\$1\"" >"e space.sh" &&
|
|
chmod a+x "e space.sh" &&
|
|
GIT_EDITOR="./e\ space.sh" git commit --amend &&
|
|
test_commit_message HEAD -m space
|
|
'
|
|
|
|
unset GIT_EDITOR
|
|
test_expect_success 'core.editor with a space' '
|
|
git config core.editor \"./e\ space.sh\" &&
|
|
git commit --amend &&
|
|
test_commit_message HEAD -m space
|
|
'
|
|
|
|
test_done
|