зеркало из https://github.com/microsoft/git.git
run-command: drop silent_exec_failure arg from wait_or_whine
We do not actually use this parameter; instead we complain from the child itself (for fork/exec) or from start_command (if we are using spawn on Windows). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
f07e5551a8
Коммит
13274526c1
|
@ -226,7 +226,7 @@ static inline void set_cloexec(int fd)
|
|||
fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
|
||||
}
|
||||
|
||||
static int wait_or_whine(pid_t pid, const char *argv0, int silent_exec_failure)
|
||||
static int wait_or_whine(pid_t pid, const char *argv0)
|
||||
{
|
||||
int status, code = -1;
|
||||
pid_t waiting;
|
||||
|
@ -432,8 +432,7 @@ fail_pipe:
|
|||
* At this point we know that fork() succeeded, but execvp()
|
||||
* failed. Errors have been reported to our stderr.
|
||||
*/
|
||||
wait_or_whine(cmd->pid, cmd->argv[0],
|
||||
cmd->silent_exec_failure);
|
||||
wait_or_whine(cmd->pid, cmd->argv[0]);
|
||||
failed_errno = errno;
|
||||
cmd->pid = -1;
|
||||
}
|
||||
|
@ -538,7 +537,7 @@ fail_pipe:
|
|||
|
||||
int finish_command(struct child_process *cmd)
|
||||
{
|
||||
return wait_or_whine(cmd->pid, cmd->argv[0], cmd->silent_exec_failure);
|
||||
return wait_or_whine(cmd->pid, cmd->argv[0]);
|
||||
}
|
||||
|
||||
int run_command(struct child_process *cmd)
|
||||
|
|
Загрузка…
Ссылка в новой задаче