diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:43 -0700 |
| commit | 6779e43b0dbcaeea84319165b1f7c7480e2fe516 (patch) | |
| tree | 74597f0b974d1ca0d09da6c64458ff0fbf48b9f0 /t | |
| parent | Merge branch 'sk/svn-parse-datestamp' (diff) | |
| parent | run_external_diff: refactor cmdline setup logic (diff) | |
| download | tgif-6779e43b0dbcaeea84319165b1f7c7480e2fe516.tar.xz | |
Merge branch 'jk/external-diff-use-argv-array'
Code clean-up (and a bugfix which has been merged for 2.0).
* jk/external-diff-use-argv-array:
run_external_diff: refactor cmdline setup logic
run_external_diff: hoist common bits out of conditional
run_external_diff: drop fflush(NULL)
run_external_diff: clean up error handling
run_external_diff: use an argv_array for the environment
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7800-difftool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 5a193c500d..dc30a514bf 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -58,7 +58,7 @@ test_expect_success PERL 'custom tool commands override built-ins' ' test_expect_success PERL 'difftool ignores bad --tool values' ' : >expect && - test_expect_code 1 \ + test_must_fail \ git difftool --no-prompt --tool=bad-tool branch >actual && test_cmp expect actual ' |