tests: Set EDITOR=: and VISUAL=: globally
This way we don't have to remember to set it for each test; and if we forget, we won't cause interactive editors to be spawned for non-interactive tests. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
55b7835e1b
commit
8ff99e7417
@ -94,7 +94,7 @@ test_expect_success \
|
|||||||
test_expect_success \
|
test_expect_success \
|
||||||
'merge-setup part 4' \
|
'merge-setup part 4' \
|
||||||
'echo "evil merge." >>file &&
|
'echo "evil merge." >>file &&
|
||||||
EDITOR=: VISUAL=: git commit -a --amend'
|
git commit -a --amend'
|
||||||
|
|
||||||
test_expect_success \
|
test_expect_success \
|
||||||
'Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor' \
|
'Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor' \
|
||||||
|
@ -190,7 +190,6 @@ test_expect_success \
|
|||||||
GIT_COMMITTER_DATE="2005-05-26 23:41" git-commit -F M -a &&
|
GIT_COMMITTER_DATE="2005-05-26 23:41" git-commit -F M -a &&
|
||||||
h_OTHER=$(git-rev-parse --verify HEAD) &&
|
h_OTHER=$(git-rev-parse --verify HEAD) &&
|
||||||
echo FIXED >F &&
|
echo FIXED >F &&
|
||||||
EDITOR=true \
|
|
||||||
GIT_AUTHOR_DATE="2005-05-26 23:44" \
|
GIT_AUTHOR_DATE="2005-05-26 23:44" \
|
||||||
GIT_COMMITTER_DATE="2005-05-26 23:44" git-commit --amend &&
|
GIT_COMMITTER_DATE="2005-05-26 23:44" git-commit --amend &&
|
||||||
h_FIXED=$(git-rev-parse --verify HEAD) &&
|
h_FIXED=$(git-rev-parse --verify HEAD) &&
|
||||||
|
@ -70,7 +70,7 @@ test_expect_success setup '
|
|||||||
for i in 1 2; do echo $i; done >>dir/sub &&
|
for i in 1 2; do echo $i; done >>dir/sub &&
|
||||||
git update-index file0 dir/sub &&
|
git update-index file0 dir/sub &&
|
||||||
|
|
||||||
EDITOR=: VISUAL=: git commit --amend &&
|
git commit --amend &&
|
||||||
git show-branch
|
git show-branch
|
||||||
'
|
'
|
||||||
|
|
||||||
|
@ -9,6 +9,8 @@ LC_ALL=C
|
|||||||
PAGER=cat
|
PAGER=cat
|
||||||
TZ=UTC
|
TZ=UTC
|
||||||
export LANG LC_ALL PAGER TZ
|
export LANG LC_ALL PAGER TZ
|
||||||
|
EDITOR=:
|
||||||
|
VISUAL=:
|
||||||
unset AUTHOR_DATE
|
unset AUTHOR_DATE
|
||||||
unset AUTHOR_EMAIL
|
unset AUTHOR_EMAIL
|
||||||
unset AUTHOR_NAME
|
unset AUTHOR_NAME
|
||||||
@ -30,6 +32,7 @@ unset SHA1_FILE_DIRECTORIES
|
|||||||
unset SHA1_FILE_DIRECTORY
|
unset SHA1_FILE_DIRECTORY
|
||||||
export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
|
export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
|
||||||
export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
|
export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
|
||||||
|
export EDITOR VISUAL
|
||||||
|
|
||||||
# Each test should start with something like this, after copyright notices:
|
# Each test should start with something like this, after copyright notices:
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user