t7800-difftool: Set a bogus tool for use by tests
If a difftool test has an error then running the git test suite may end up invoking a GUI diff tool. We now guard against this by setting a difftool.bogus-tool.cmd variable. The tests already used --tool=bogus-tool in various places so this is simply ensuring that nothing ever falls back and finds a real diff tool. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Aguilar committed
Dec 22, 2009 at 21:27 UTC
23218bbd2ea7f919b93245489e544a55165ec466
1 file changed
+2
-1
t/t7800-difftool.sh
+2
-1
@@ -36,6 +36,7 @@ restore_test_defaults()
36
unset GIT_DIFFTOOL_NO_PROMPT
37
git config diff.tool test-tool &&
38
git config difftool.test-tool.cmd 'cat $LOCAL'
39
+ git config difftool.bogus-tool.cmd false
40
}
41
42
prompt_given()
@@ -71,7 +72,7 @@ test_expect_success 'custom commands' '
72
73
# Ensures that git-difftool ignores bogus --tool values
74
test_expect_success 'difftool ignores bad --tool values' '
74
- diff=$(git difftool --no-prompt --tool=bogus-tool branch)
75
+ diff=$(git difftool --no-prompt --tool=bad-tool branch)
76
test "$?" = 1 &&
77
test "$diff" = ""
78
'