undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

run-command: drop silent_exec_failure arg from wait_or_whine

Browse Source 
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:
Jeff King 2012-11-30 17:40:50 -05:00 committed by Junio C Hamano
parent f07e5551a8
commit 13274526c1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
run-command.c
View File

@ -226,7 +226,7 @@ static inline void set_cloexec(int fd)
fcntl(fd, F_SETFD, flags | FD_CLOEXEC); 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; int status, code = -1;
pid_t waiting; pid_t waiting;
@ -432,8 +432,7 @@ fail_pipe:
* At this point we know that fork() succeeded, but execvp() * At this point we know that fork() succeeded, but execvp()
* failed. Errors have been reported to our stderr. * failed. Errors have been reported to our stderr.
*/ */
wait_or_whine(cmd->pid, cmd->argv[0], wait_or_whine(cmd->pid, cmd->argv[0]);
cmd->silent_exec_failure);
failed_errno = errno; failed_errno = errno;
cmd->pid = -1; cmd->pid = -1;
} }
@ -538,7 +537,7 @@ fail_pipe:
int finish_command(struct child_process *cmd) 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) int run_command(struct child_process *cmd)