admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dk/t7005-editor-updates'

Browse Source 
Test clean-up.

* dk/t7005-editor-updates:
  t7005: sanitize test environment for subsequent tests
  t7005: stop abusing --exec-path
  t7005: use modern test style
This commit is contained in:
Junio C Hamano
2025-08-25 14:22:02 -07:00
parent 0d8f4ccfe3 a60203a015
commit 80d99d9265
1 changed files with 59 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
t/t7005-editor.sh
View File

@@ -7,125 +7,96 @@ test_description='GIT_EDITOR, core.editor, and stuff'
unset EDITOR VISUAL GIT_EDITOR
test_expect_success 'determine default editor' '
vi=$(TERM=vt100 git var GIT_EDITOR) &&
test -n "$vi"
'
if ! expr "$vi" : '[a-z]*$' >/dev/null
then
vi=
fi
for i in GIT_EDITOR core_editor EDITOR VISUAL $vi
do
cat >e-$i.sh <<-EOF
#!$SHELL_PATH
echo "Edited by $i" >"\$1"
EOF
chmod +x e-$i.sh
done
if ! test -z "$vi"
then
mv e-$vi.sh $vi
fi
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" &&
echo "$msg" >expect &&
git show -s --format=%s > actual &&
test_cmp expect actual
test_commit_message HEAD -m "$msg"
'
TERM=dumb
export TERM
test_expect_success 'dumb should error out when falling back on vi' '
if git commit --amend
then
echo "Oops?"
false
else
: happy
fi
test_must_fail env TERM=dumb 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 "$(git show -s --format=%s)" = "Edited by EDITOR"
TERM=dumb EDITOR=./e-EDITOR.sh VISUAL=./e-VISUAL.sh \
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 &&
git show -s --pretty=oneline |
sed -e "s/^[0-9a-f]* //" >actual &&
test_cmp expect actual
if test "$i" = core_editor
then
test_config core.editor ./e-core_editor.sh
fi &&
(
case "$i" in
[A-Z]*)
eval "$i=./e-$i.sh" &&
export $i
;;
esac &&
PATH="$PWD:$PATH" TERM=vt100 git commit --amend
) &&
test_commit_message HEAD -m "Edited by $i"
'
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 &&
git show -s --pretty=oneline |
sed -e "s/^[0-9a-f]* //" >actual &&
test_cmp expect actual
'
done
test_expect_success 'Using editors with overrides' '
(
TERM=vt100 &&
export TERM &&
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 &&
PATH="$PWD:$PATH" git commit --amend &&
test_commit_message HEAD expect || exit 1
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 space = "$(git show -s --pretty=format:%s)"
test_commit_message HEAD -m space
'
unset GIT_EDITOR
test_expect_success 'core.editor with a space' '
git config core.editor \"./e\ space.sh\" &&
test_config core.editor \"./e\ space.sh\" &&
git commit --amend &&
test space = "$(git show -s --pretty=format:%s)"
test_commit_message HEAD -m space
'
test_done