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>

Jeff King committed Apr 19, 2014 at 15:19 UTC 89294d143d42db2540ec587d0bce20c6c7718051
2 files changed +4 -7
diff.c
+3 -6
@@ -2909,7 +2909,6 @@ static void run_external_diff(const char *pgm,
2909 {
2910 struct argv_array argv = ARGV_ARRAY_INIT;
2911 struct argv_array env = ARGV_ARRAY_INIT;
2912 - int retval;
2912 struct diff_queue_struct *q = &diff_queued_diff;
2913
2914 if (one && two) {
@@ -2938,14 +2937,12 @@ static void run_external_diff(const char *pgm,
2937 argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
2938 argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
2939
2941 - retval = run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv);
2940 + if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
2941 + die(_("external diff died, stopping at %s"), name);
2942 +
2943 remove_tempfile();
2944 argv_array_clear(&argv);
2945 argv_array_clear(&env);
2945 - if (retval) {
2946 - fprintf(stderr, "external diff died, stopping at %s.\n", name);
2947 - exit(1);
2948 - }
2946 }
2947
2948 static int similarity_index(struct diff_filepair *p)
t/t7800-difftool.sh
+1 -1
@@ -58,7 +58,7 @@ test_expect_success PERL 'custom tool commands override built-ins' '
58
59 test_expect_success PERL 'difftool ignores bad --tool values' '
60 : >expect &&
61 - test_expect_code 1 \
61 + test_must_fail \
62 git difftool --no-prompt --tool=bad-tool branch >actual &&
63 test_cmp expect actual
64 '