diff options
| author | Jeff King <peff@peff.net> | 2014-04-19 19:19:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-21 17:31:36 (GMT) |
| commit | 89294d143d42db2540ec587d0bce20c6c7718051 (patch) | |
| tree | c5e91c0e8a1a015d145074bd483636cfb16eae99 /t/t7800-difftool.sh | |
| parent | ae049c955c8858899467f6c5c0259c48a5294385 (diff) | |
| download | git-89294d143d42db2540ec587d0bce20c6c7718051.zip git-89294d143d42db2540ec587d0bce20c6c7718051.tar.gz git-89294d143d42db2540ec587d0bce20c6c7718051.tar.bz2 | |
run_external_diff: clean up error handling
When the external diff reports an error, we try to clean up
and die. However, we can make this process a bit simpler:
1. We do not need to bother freeing memory, since we are
about to exit. Nor do we need to clean up our
tempfiles, since the atexit() handler will do it for
us. So we can die as soon as we see the error.
3. We can just call die() rather than fprintf/exit. This
does technically change our exit code, but the exit
code of "1" is not meaningful here. In fact, it is
probably wrong, since "1" from diff usually means
"completed successfully, but there were differences".
And while we're there, we can mark the error message for
translation, and drop the full stop at the end to make it
more like our other messages.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7800-difftool.sh')
| -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 5a193c5..dc30a51 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 ' |