зеркало из https://github.com/microsoft/git.git
run-command: trivial style fixes
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
4e7e4b6b1b
Коммит
5a50085c6b
|
@ -406,13 +406,12 @@ fail_pipe:
|
||||||
unsetenv(*cmd->env);
|
unsetenv(*cmd->env);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (cmd->git_cmd) {
|
if (cmd->git_cmd)
|
||||||
execv_git_cmd(cmd->argv);
|
execv_git_cmd(cmd->argv);
|
||||||
} else if (cmd->use_shell) {
|
else if (cmd->use_shell)
|
||||||
execv_shell_cmd(cmd->argv);
|
execv_shell_cmd(cmd->argv);
|
||||||
} else {
|
else
|
||||||
sane_execvp(cmd->argv[0], (char *const*) cmd->argv);
|
sane_execvp(cmd->argv[0], (char *const*) cmd->argv);
|
||||||
}
|
|
||||||
if (errno == ENOENT) {
|
if (errno == ENOENT) {
|
||||||
if (!cmd->silent_exec_failure)
|
if (!cmd->silent_exec_failure)
|
||||||
error("cannot run %s: %s", cmd->argv[0],
|
error("cannot run %s: %s", cmd->argv[0],
|
||||||
|
@ -446,7 +445,6 @@ fail_pipe:
|
||||||
cmd->pid = -1;
|
cmd->pid = -1;
|
||||||
}
|
}
|
||||||
close(notify_pipe[0]);
|
close(notify_pipe[0]);
|
||||||
|
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
{
|
{
|
||||||
|
@ -480,11 +478,10 @@ fail_pipe:
|
||||||
if (cmd->env)
|
if (cmd->env)
|
||||||
env = make_augmented_environ(cmd->env);
|
env = make_augmented_environ(cmd->env);
|
||||||
|
|
||||||
if (cmd->git_cmd) {
|
if (cmd->git_cmd)
|
||||||
cmd->argv = prepare_git_cmd(cmd->argv);
|
cmd->argv = prepare_git_cmd(cmd->argv);
|
||||||
} else if (cmd->use_shell) {
|
else if (cmd->use_shell)
|
||||||
cmd->argv = prepare_shell_cmd(cmd->argv);
|
cmd->argv = prepare_shell_cmd(cmd->argv);
|
||||||
}
|
|
||||||
|
|
||||||
cmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, env, cmd->dir,
|
cmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, env, cmd->dir,
|
||||||
fhin, fhout, fherr);
|
fhin, fhout, fherr);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче