From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Jul 2008 23:42:08 +0000 (-0700)
Subject: Merge branch 'qq/maint'
X-Git-Tag: v1.6.0-rc0~115
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bed625540a0e1a4ba4da9962ed53c1d83d9bf509;p=git.git

Merge branch 'qq/maint'

* qq/maint:
  run_command(): respect GIT_TRACE

Conflicts:

	run-command.c
---

bed625540a0e1a4ba4da9962ed53c1d83d9bf509
diff --cc run-command.c
index 2ce8c2b2f,7068ec7e6..6e29fdf9e
--- a/run-command.c
+++ b/run-command.c
@@@ -65,8 -65,23 +65,10 @@@ int start_command(struct child_process 
  		cmd->err = fderr[0];
  	}
  
+ 	trace_argv_printf(cmd->argv, "trace: run_command:");
+ 
 +#ifndef __MINGW32__
  	cmd->pid = fork();
 -	if (cmd->pid < 0) {
 -		if (need_in)
 -			close_pair(fdin);
 -		else if (cmd->in)
 -			close(cmd->in);
 -		if (need_out)
 -			close_pair(fdout);
 -		else if (cmd->out)
 -			close(cmd->out);
 -		if (need_err)
 -			close_pair(fderr);
 -		return -ERR_RUN_COMMAND_FORK;
 -	}
 -
  	if (!cmd->pid) {
  		if (cmd->no_stdin)
  			dup_devnull(0);