Allow run_command stdout_to_stderr when stderr is a pipe
PATCH 1/6 Allow run_command stdout_to_stderr when stderr is a pipe
To allow receive-pack hooks to have their stdout and stderr streams redirected to the same pipe we need to setup the pipe on fd 2 before we dup fd 2 over to fd 1. This way we can use a single pipe to capture both stdout and stderr and redirect it to a sideband channel, or elsewhere.
Signed-off-by Shawn O. Pearce <[email protected]>
--- run-command.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
run-command.c +7 -7
@@ -75,6 +75,13 @@ int start_command(struct child_process *cmd)close (cmd->in); } +if (cmd->no_stderr) +dup_devnull (2 ); +else if (need_err) { +dup2 (fderr[1 ],2 ); +close_pair (fderr); + } +if (cmd->no_stdout)dup_devnull (1 );else if (cmd->stdout_to_stderr)
@@ -87,13 +94,6 @@ int start_command(struct child_process *cmd)close (cmd->out); } -if (cmd->no_stderr) -dup_devnull (2 ); -else if (need_err) { -dup2 (fderr[1 ],2 ); -close_pair (fderr); - } -if (cmd->dir &&chdir (cmd->dir))die ("exec %s: cd to %s failed (%s)" , cmd->argv[0 ], cmd->dir,strerror (errno));
Signature · 1 line
1.5.4.1.1309.g833c2