Merge branch 'bs/maint-t7005'

* bs/maint-t7005:
  t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
maint
Junio C Hamano 2007-11-14 14:25:19 -08:00
commit 9f165805f3
1 changed files with 2 additions and 3 deletions

View File

@ -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