From cc65fa98d284adbb0586c1145fb9ee189f9228b5 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Sat, 10 Sep 2016 09:24:28 -0700 Subject: [PATCH] Add regression test for external diff tools See #409 Resolves #410 --- tests/staged_files_only_test.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/staged_files_only_test.py b/tests/staged_files_only_test.py index 993d33d5..5099c2d3 100644 --- a/tests/staged_files_only_test.py +++ b/tests/staged_files_only_test.py @@ -71,6 +71,13 @@ def test_foo_something_unstaged(foo_staged, cmd_runner): _test_foo_state(foo_staged, 'herp\nderp\n', 'AM') +def test_something_unstaged_ext_diff_tool(foo_staged, cmd_runner, tmpdir): + diff_tool = tmpdir.join('diff-tool.sh') + diff_tool.write('#!/usr/bin/env bash\necho "$@"\n') + cmd_output('git', 'config', 'diff.external', diff_tool.strpath) + test_foo_something_unstaged(foo_staged, cmd_runner) + + def test_foo_something_unstaged_diff_color_always(foo_staged, cmd_runner): cmd_output('git', 'config', '--local', 'color.diff', 'always') test_foo_something_unstaged(foo_staged, cmd_runner)