t7800-difftool: Set a bogus tool for use by tests

davvid · gitster · commit 23218bbd2ea7 · 2010-01-03T00:29:10.000-08:00
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 &lt;davvid@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
@@ -36,6 +36,7 @@ restore_test_defaults()
 	unset GIT_DIFFTOOL_NO_PROMPT
 	git config diff.tool test-tool &&
 	git config difftool.test-tool.cmd 'cat $LOCAL'
+	git config difftool.bogus-tool.cmd false
 }
 
 prompt_given()
@@ -71,7 +72,7 @@ test_expect_success 'custom commands' '
 
 # Ensures that git-difftool ignores bogus --tool values
 test_expect_success 'difftool ignores bad --tool values' '
-	diff=$(git difftool --no-prompt --tool=bogus-tool branch)
+	diff=$(git difftool --no-prompt --tool=bad-tool branch)
 	test "$?" = 1 &&
 	test "$diff" = ""
 '

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ restore_test_defaults()`
`36`	`36`	`unset GIT_DIFFTOOL_NO_PROMPT`
`37`	`37`	`git config diff.tool test-tool &&`
`38`	`38`	`git config difftool.test-tool.cmd 'cat $LOCAL'`
	`39`	`+ git config difftool.bogus-tool.cmd false`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`prompt_given()`
`@@ -71,7 +72,7 @@ test_expect_success 'custom commands' '`
`71`	`72`
`72`	`73`	`# Ensures that git-difftool ignores bogus --tool values`
`73`	`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)`
`75`	`76`	`test "$?" = 1 &&`
`76`	`77`	`test "$diff" = ""`
`77`	`78`	`'`