mirror of
https://github.com/git/git.git
synced 2024-11-19 09:13:55 +01:00
e70f320251
The git wrapper executable always prepends the GIT_EXEC_PATH build variable to the current PATH, so prepending "." to the PATH is not enough to give precedence to the fake vi executable. The --exec-path option allows to prepend a directory to PATH even before GIT_EXEC_PATH (which is added anyway), so we can use that instead. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
91 lines
1.6 KiB
Bash
Executable File
91 lines
1.6 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='GIT_EDITOR, core.editor, and stuff'
|
|
|
|
. ./test-lib.sh
|
|
|
|
for i in GIT_EDITOR core_editor EDITOR VISUAL vi
|
|
do
|
|
cat >e-$i.sh <<-EOF
|
|
echo "Edited by $i" >"\$1"
|
|
EOF
|
|
chmod +x e-$i.sh
|
|
done
|
|
unset vi
|
|
mv e-vi.sh vi
|
|
unset EDITOR VISUAL GIT_EDITOR
|
|
|
|
test_expect_success setup '
|
|
|
|
msg="Hand edited" &&
|
|
echo "$msg" >expect &&
|
|
git add vi &&
|
|
test_tick &&
|
|
git commit -m "$msg" &&
|
|
git show -s --pretty=oneline |
|
|
sed -e "s/^[0-9a-f]* //" >actual &&
|
|
diff actual expect
|
|
|
|
'
|
|
|
|
TERM=dumb
|
|
export TERM
|
|
test_expect_success 'dumb should error out when falling back on vi' '
|
|
|
|
if git commit --amend
|
|
then
|
|
echo "Oops?"
|
|
exit 1
|
|
else
|
|
: happy
|
|
fi
|
|
'
|
|
|
|
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 &&
|
|
diff actual 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 &&
|
|
git show -s --pretty=oneline |
|
|
sed -e "s/^[0-9a-f]* //" >actual &&
|
|
diff actual expect
|
|
'
|
|
done
|
|
|
|
test_done
|