diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-14 22:25:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-14 22:25:19 (GMT) |
| commit | 9f165805f3bde8cd91653f2db1c35a4548b85625 (patch) | |
| tree | b8953145506249a3d2ee64f8b680f9c77b34e5cc /t/t7005-editor.sh | |
| parent | c78a24986d4d3faff810e87dbcd0ac99f0eabbce (diff) | |
| parent | e70f3202512a022898657047b59b46355be1631b (diff) | |
| download | git-9f165805f3bde8cd91653f2db1c35a4548b85625.zip git-9f165805f3bde8cd91653f2db1c35a4548b85625.tar.gz git-9f165805f3bde8cd91653f2db1c35a4548b85625.tar.bz2 | |
Merge branch 'bs/maint-t7005'
* bs/maint-t7005:
t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
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 01cc0c0..44228b5 100755 --- a/t/t7005-editor.sh +++ b/t/t7005-editor.sh @@ -15,7 +15,6 @@ do done unset vi mv e-vi.sh vi -PATH=".:$PATH" unset EDITOR VISUAL GIT_EDITOR test_expect_success setup ' @@ -61,7 +60,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 @@ -83,7 +82,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 |