From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Nanako Shiraishi <nanako3@lavabit.com>, git@vger.kernel.org
Subject: [PATCH 6/6] diff: run external diff helper with shell
Date: Wed, 30 Dec 2009 06:03:35 -0500 [thread overview]
Message-ID: <20091230110335.GF22959@coredump.intra.peff.net> (raw)
In-Reply-To: <20091230095634.GA16349@coredump.intra.peff.net>
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>
---
Consistency is the main advantage here. Though I think you can actually
do craziness like setting
GIT_EXTERNAL_DIFF='my-command $2 $3 && true' git diff
to pick out some subset of the parameters, I can't imagine it is
actually a good idea.
diff.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/diff.c b/diff.c
index 2794238..9bb40bc 100644
--- a/diff.c
+++ b/diff.c
@@ -2294,7 +2294,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);
--
1.6.6.65.g050d2.dirty
next prev parent reply other threads:[~2009-12-30 11:03 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-14 22:17 Giving command line parameter to textconv command? Nanako Shiraishi
2009-12-14 23:31 ` Junio C Hamano
2009-12-15 3:11 ` Nanako Shiraishi
2009-12-15 5:56 ` Junio C Hamano
2009-12-15 16:49 ` Jeff King
2009-12-16 1:05 ` Junio C Hamano
2009-12-16 1:13 ` Jeff King
2009-12-15 17:03 ` Jeff King
2009-12-15 17:23 ` Junio C Hamano
2009-12-30 3:13 ` Nanako Shiraishi
2009-12-30 8:05 ` Junio C Hamano
2009-12-30 9:56 ` Jeff King
2009-12-30 10:53 ` [PATCH 1/6] run-command: add "use shell" option Jeff King
2009-12-30 13:55 ` Erik Faye-Lund
2010-01-01 22:12 ` Johannes Sixt
2009-12-30 10:53 ` [PATCH 2/6] run-command: convert simple callsites to use_shell Jeff King
2009-12-30 10:55 ` [PATCH 3/6] run-command: optimize out useless shell calls Jeff King
2009-12-31 16:54 ` Johannes Sixt
2009-12-31 19:47 ` Junio C Hamano
2009-12-31 21:41 ` Johannes Sixt
2009-12-31 21:41 ` Jeff King
2009-12-31 22:16 ` Johannes Sixt
2010-01-01 4:50 ` Jeff King
2010-01-01 10:08 ` Johannes Sixt
2009-12-30 10:56 ` [PATCH 4/6] editor: use run_command's shell feature Jeff King
2009-12-30 11:01 ` [PATCH 5/6] textconv: use shell to run helper Jeff King
2009-12-30 11:03 ` Jeff King [this message]
2010-01-01 22:14 ` [PATCH 7/6] t0021: use $SHELL_PATH for the filter script Johannes Sixt
2010-01-01 22:15 ` [PATCH 8/6] t4030, t4031: work around bogus MSYS bash path conversion Johannes Sixt
2010-01-03 7:24 ` [PATCH 7/6] t0021: use $SHELL_PATH for the filter script Jeff King
2010-01-04 15:50 ` Johannes Sixt
2010-01-04 16:03 ` Jeff King
2010-01-04 16:46 ` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091230110335.GF22959@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nanako3@lavabit.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).