From ac0ba18df0c58decfb128336bab51a172c77abc0 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 30 Dec 2009 05:53:57 -0500 Subject: 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 Signed-off-by: Junio C Hamano --- ll-merge.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'll-merge.c') 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; -- cgit v1.2.1