X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=run-command.c;h=476d00c2182e3af82a0cfe495c61c9df1eb44d26;hb=f5ed3b30e0091421408a0119fa75148955c4fc6a;hp=d99a6c4ea7c776bec717c9952f77db7fa9a69c21;hpb=03800743156fe4f331a10c0983b9d633bed3a687;p=git.git

diff --git a/run-command.c b/run-command.c
index d99a6c4ea..476d00c21 100644
--- a/run-command.c
+++ b/run-command.c
@@ -41,7 +41,7 @@ int start_command(struct child_process *cmd)
 		cmd->close_out = 1;
 	}
 
-	need_err = cmd->err < 0;
+	need_err = !cmd->no_stderr && cmd->err < 0;
 	if (need_err) {
 		if (pipe(fderr) < 0) {
 			if (need_in)
@@ -87,7 +87,9 @@ int start_command(struct child_process *cmd)
 			close(cmd->out);
 		}
 
-		if (need_err) {
+		if (cmd->no_stderr)
+			dup_devnull(2);
+		else if (need_err) {
 			dup2(fderr[1], 2);
 			close_pair(fderr);
 		}