diff options
| author | Jeff King <peff@peff.net> | 2009-12-30 05:53:57 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-05 23:41:50 -0800 |
| commit | ac0ba18df0c58decfb128336bab51a172c77abc0 (patch) | |
| tree | 4c36514cde57577ad2533e87decccdaa0c939c6e /ll-merge.c | |
| parent | fa7151a61edf585abdbb3d2831e7992bf3925671 (diff) | |
| download | git-ac0ba18df0c58decfb128336bab51a172c77abc0.tar.gz git-ac0ba18df0c58decfb128336bab51a172c77abc0.tar.xz | |
run-command: convert simple callsites to use_shell
Now that we have the use_shell feature, these callsites can
all be converted with small changes.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ll-merge.c b/ll-merge.c index 2d6b6d6cb..18511e281 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -175,7 +175,7 @@ static int ll_ext_merge(const struct ll_merge_driver *fn, { "B", temp[2] }, { NULL } }; - const char *args[] = { "sh", "-c", NULL, NULL }; + const char *args[] = { NULL, NULL }; int status, fd, i; struct stat st; @@ -190,8 +190,8 @@ static int ll_ext_merge(const struct ll_merge_driver *fn, strbuf_expand(&cmd, fn->cmdline, strbuf_expand_dict_cb, &dict); - args[2] = cmd.buf; - status = run_command_v_opt(args, 0); + args[0] = cmd.buf; + status = run_command_v_opt(args, RUN_USING_SHELL); fd = open(temp[1], O_RDONLY); if (fd < 0) goto bad; |