From: Jeff King <peff@peff.net>
Date: Wed, 30 Dec 2009 11:03:35 +0000 (-0500)
Subject: diff: run external diff helper with shell
X-Git-Tag: v1.7.0-rc0~94^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7ed7fac45a696ba6343707c7c8f4b268f309be32;p=git.git

diff: run external diff helper with shell

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 --git a/diff.c b/diff.c
index 4af7c3f92..3b235e39b 100644
--- 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);