aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-12-30 06:03:35 -0500
committerJunio C Hamano <gitster@pobox.com>2010-01-05 23:41:51 -0800
commit7ed7fac45a696ba6343707c7c8f4b268f309be32 (patch)
tree66512b8d3067e07a73edf33337eb7aea49a4abf9
parent41a457e4f814a0e514548b3178e7692129f0fcfe (diff)
downloadgit-7ed7fac45a696ba6343707c7c8f4b268f309be32.tar.gz
git-7ed7fac45a696ba6343707c7c8f4b268f309be32.tar.xz
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>
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
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);