| commit | 23218bbd2ea7f919b93245489e544a55165ec466 | |
| author | David Aguilar <davvid@gmail.com> | |
| Wed, 23 Dec 2009 05:27:13 +0000 (22 21:27 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 3 Jan 2010 08:29:10 +0000 (3 00:29 -0800) | ||
| tree | 793b89f67ad1a7f303feb82edd68f34430151c12 | treesnapshot (tar.gz zip) |
| parent | 902f235378cb2b2f6dd5dd664b9630c95321f0ae | commitdiff |
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>
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>
| t/t7800-difftool.sh | diffblobblamehistory |