undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH

Browse Source 
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:
Björn Steinbrink 2007-11-11 18:38:11 +01:00 committed by Junio C Hamano
parent a91ef6e75b
commit e70f320251
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
t/t7005-editor.sh
View File

@ -13,7 +13,6 @@ do
done done
unset vi unset vi
mv e-vi.sh vi mv e-vi.sh vi
PATH=".:$PATH"
unset EDITOR VISUAL GIT_EDITOR unset EDITOR VISUAL GIT_EDITOR
test_expect_success setup ' test_expect_success setup '
@ -59,7 +58,7 @@ do
;; ;;
esac esac
test_expect_success "Using $i" ' test_expect_success "Using $i" '
git commit --amend && git --exec-path=. commit --amend &&
git show -s --pretty=oneline | git show -s --pretty=oneline |
sed -e "s/^[0-9a-f]* //" >actual && sed -e "s/^[0-9a-f]* //" >actual &&
diff actual expect diff actual expect
@ -81,7 +80,7 @@ do
;; ;;
esac esac
test_expect_success "Using $i (override)" ' test_expect_success "Using $i (override)" '
git commit --amend && git --exec-path=. commit --amend &&
git show -s --pretty=oneline | git show -s --pretty=oneline |
sed -e "s/^[0-9a-f]* //" >actual && sed -e "s/^[0-9a-f]* //" >actual &&
diff actual expect diff actual expect