summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Mark Wooding <mdw@distorted.org.uk>2006-03-12 14:00:30 +0000
committerLibravatar Junio C Hamano <junkio@cox.net>2006-03-12 11:50:23 -0800
commit8c3222079a9aca6622c6098a9157e59dddb1cfff (patch)
tree3b0066ddafde1acabe54854bd9aa6f81df7b4b23 /t
parentimap-send: Add missing #include for macosx (diff)
downloadtgif-8c3222079a9aca6622c6098a9157e59dddb1cfff.tar.xz
annotate-tests: override VISUAL when running tests.
The tests hang for me waiting for Emacs with its output directed somewhere strage, because I hedged my bets and set both EDITOR and VISUAL to run Emacs. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rw-r--r--t/annotate-tests.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 9c5a15a15e..114938c3ff 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -94,7 +94,7 @@ test_expect_success \
test_expect_success \
'merge-setup part 4' \
'echo "evil merge." >>file &&
- EDITOR=: git commit -a --amend'
+ EDITOR=: VISUAL=: 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' \