diff options
| author |  Björn Steinbrink <B.Steinbrink@gmx.de> | 2007-11-11 18:38:11 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-11-11 15:50:59 -0800 |
| commit | e70f3202512a022898657047b59b46355be1631b (patch) | |
| tree | 6e314f7a74fead342ba18799cf900a58d8f8bd3e /t/t7005-editor.sh | |
| parent | fix index-pack with packs >4GB containing deltas on 32-bit machines (diff) | |
| download | tgif-e70f3202512a022898657047b59b46355be1631b.tar.xz | |
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>
Diffstat (limited to 't/t7005-editor.sh')
| -rwxr-xr-x | t/t7005-editor.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh index 28643b0da4..ed416e14e0 100755 --- a/t/t7005-editor.sh +++ b/t/t7005-editor.sh @@ -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 |