mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

run-command: convert simple callsites to use_shell

Browse Source 
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>
This commit is contained in:
Jeff King
2009-12-30 05:53:57 -05:00
committed by Junio C Hamano
parent fa7151a61e
commit ac0ba18df0
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ll-merge.c
View File

@ -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;