diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-25 02:01:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-25 02:01:46 (GMT) |
| commit | 18a135f419b803fd6d18c8e3f4b0194f11732d0f (patch) | |
| tree | 0a83ca2302ecae68d71728ae033be98383e4daa9 /t | |
| parent | 89919f4f57006358c278c1f207249edcccbe68c4 (diff) | |
| parent | e70f3202512a022898657047b59b46355be1631b (diff) | |
| download | git-18a135f419b803fd6d18c8e3f4b0194f11732d0f.zip git-18a135f419b803fd6d18c8e3f4b0194f11732d0f.tar.gz git-18a135f419b803fd6d18c8e3f4b0194f11732d0f.tar.bz2 | |
Merge branch 'bs/maint-t7005' into maint
* bs/maint-t7005:
t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
Diffstat (limited to 't')
| -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 28643b0..ed416e1 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 |