Commit 18a135f4 authored by Junio C Hamano's avatar Junio C Hamano

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
parents 89919f4f e70f3202
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment