1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 13:57:54 +01:00

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
This commit is contained in:
Junio C Hamano 2007-11-24 18:01:46 -08:00
commit 18a135f419

View file

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