Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
run-command: drop silent_exec_failure arg from wait_or_whine
author
Jeff King
<peff@peff.net>
Fri, 30 Nov 2012 22:40:50 +0000
(17:40 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 2 Dec 2012 10:04:50 +0000
(
02:04
-0800)
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>
run-command.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
f07e555
)
diff --git
a/run-command.c
b/run-command.c
index 3b982e4d55274ebe87c5751fa198bee53e371d9b..3aae270dd3fef24bb172a82f749c67ce59446692 100644
(file)
--- a/
run-command.c
+++ b/
run-command.c
@@
-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;
pid_t waiting;
{
int status, code = -1;
pid_t waiting;
@@
-432,8
+432,7
@@
int start_command(struct child_process *cmd)
* At this point we know that fork() succeeded, but execvp()
* failed. Errors have been reported to our stderr.
*/
* 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;
}
failed_errno = errno;
cmd->pid = -1;
}
@@
-538,7
+537,7
@@
int start_command(struct child_process *cmd)
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)