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

Simplify some instances of run_command() by using run_command_v_opt().

Browse Source 
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Sixt
2009-06-08 22:34:29 +02:00
committed by Junio C Hamano
parent e169b97459
commit 0077138cd9
3 changed files with 18 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ll-merge.c
View File

@ -175,8 +175,7 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
{ "B", temp[2] },
{ NULL }
};
struct child_process child;
const char *args[20];
const char *args[] = { "sh", "-c", NULL, NULL };
int status, fd, i;
struct stat st;
@ -191,14 +190,8 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
strbuf_expand(&cmd, fn->cmdline, strbuf_expand_dict_cb, &dict);
memset(&child, 0, sizeof(child));
child.argv = args;
args[0] = "sh";
args[1] = "-c";
args[2] = cmd.buf;
args[3] = NULL;
status = run_command(&child);
status = run_command_v_opt(args, 0);
if (status < -ERR_RUN_COMMAND_FORK)
; /* failure in run-command */
else