diff: run external diff helper with shell
authorJeff King <peff@peff.net>
Wed, 30 Dec 2009 11:03:35 +0000 (06:03 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jan 2010 07:41:51 +0000 (23:41 -0800)
This is mostly to make it more consistent with the rest of
git, which uses the shell to exec helpers.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c

diff --git a/diff.c b/diff.c
index 4af7c3f9257a32ce694ff3dc902fe0aa71d4820b..3b235e39ba13d407c4c472f91e658fa45902327b 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2275,7 +2275,7 @@ static void run_external_diff(const char *pgm,
        }
        *arg = NULL;
        fflush(NULL);
-       retval = run_command_v_opt(spawn_arg, 0);
+       retval = run_command_v_opt(spawn_arg, RUN_USING_SHELL);
        remove_tempfile();
        if (retval) {
                fprintf(stderr, "external diff died, stopping at %s.\n", name);