Browse Source

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>
maint
Eric Wong 19 years ago committed by Junio C Hamano
parent
commit
8ff99e7417
  1. 2
      t/annotate-tests.sh
  2. 1
      t/t1400-update-ref.sh
  3. 2
      t/t4013-diff-various.sh
  4. 3
      t/test-lib.sh

2
t/annotate-tests.sh

@ -94,7 +94,7 @@ test_expect_success \ @@ -94,7 +94,7 @@ test_expect_success \
test_expect_success \
'merge-setup part 4' \
'echo "evil merge." >>file &&
EDITOR=: VISUAL=: git commit -a --amend'
git commit -a --amend'

test_expect_success \
'Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor' \

1
t/t1400-update-ref.sh

@ -190,7 +190,6 @@ test_expect_success \ @@ -190,7 +190,6 @@ test_expect_success \
GIT_COMMITTER_DATE="2005-05-26 23:41" git-commit -F M -a &&
h_OTHER=$(git-rev-parse --verify HEAD) &&
echo FIXED >F &&
EDITOR=true \
GIT_AUTHOR_DATE="2005-05-26 23:44" \
GIT_COMMITTER_DATE="2005-05-26 23:44" git-commit --amend &&
h_FIXED=$(git-rev-parse --verify HEAD) &&

2
t/t4013-diff-various.sh

@ -70,7 +70,7 @@ test_expect_success setup ' @@ -70,7 +70,7 @@ test_expect_success setup '
for i in 1 2; do echo $i; done >>dir/sub &&
git update-index file0 dir/sub &&

EDITOR=: VISUAL=: git commit --amend &&
git commit --amend &&
git show-branch
'


3
t/test-lib.sh

@ -9,6 +9,8 @@ LC_ALL=C @@ -9,6 +9,8 @@ LC_ALL=C
PAGER=cat
TZ=UTC
export LANG LC_ALL PAGER TZ
EDITOR=:
VISUAL=:
unset AUTHOR_DATE
unset AUTHOR_EMAIL
unset AUTHOR_NAME
@ -30,6 +32,7 @@ unset SHA1_FILE_DIRECTORIES @@ -30,6 +32,7 @@ unset SHA1_FILE_DIRECTORIES
unset SHA1_FILE_DIRECTORY
export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
export EDITOR VISUAL

# Each test should start with something like this, after copyright notices:
#

Loading…
Cancel
Save