зеркало из https://github.com/microsoft/git.git
t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
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>
This commit is contained in:
Родитель
a91ef6e75b
Коммит
e70f320251
|
@ -13,7 +13,6 @@ do
|
|||
done
|
||||
unset vi
|
||||
mv e-vi.sh vi
|
||||
PATH=".:$PATH"
|
||||
unset EDITOR VISUAL GIT_EDITOR
|
||||
|
||||
test_expect_success setup '
|
||||
|
@ -59,7 +58,7 @@ do
|
|||
;;
|
||||
esac
|
||||
test_expect_success "Using $i" '
|
||||
git commit --amend &&
|
||||
git --exec-path=. commit --amend &&
|
||||
git show -s --pretty=oneline |
|
||||
sed -e "s/^[0-9a-f]* //" >actual &&
|
||||
diff actual expect
|
||||
|
@ -81,7 +80,7 @@ do
|
|||
;;
|
||||
esac
|
||||
test_expect_success "Using $i (override)" '
|
||||
git commit --amend &&
|
||||
git --exec-path=. commit --amend &&
|
||||
git show -s --pretty=oneline |
|
||||
sed -e "s/^[0-9a-f]* //" >actual &&
|
||||
diff actual expect
|
||||
|
|
Загрузка…
Ссылка в новой задаче