Merge branch 'bs/maint-t7005'

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

diff --combined t/t7005-editor.sh
index 01cc0c02b1c20afef664110389b88af702c52ef7,ed416e14e07950d9c7a0d0b85cd9e0307dd55a65..44228b5ac12f5df9d6def93dc74e3687ba2d8e73
--- 1/t/t7005-editor.sh
--- 2/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@@ -4,8 -4,6 +4,8 @@@ test_description='GIT_EDITOR, core.edit
  
  . ./test-lib.sh
  
 +OLD_TERM="$TERM"
 +
  for i in GIT_EDITOR core_editor EDITOR VISUAL vi
  do
        cat >e-$i.sh <<-EOF
@@@ -15,7 -13,6 +15,6 @@@
  done
  unset vi
  mv e-vi.sh vi
- PATH=".:$PATH"
  unset EDITOR VISUAL GIT_EDITOR
  
  test_expect_success setup '
@@@ -61,7 -58,7 +60,7 @@@ d
                ;;
        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,13 -80,11 +82,13 @@@ d
                ;;
        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
        '
  done
  
 +TERM="$OLD_TERM"
 +
  test_done