Merge branch 'qq/maint' into maint

gitster · gitster · commit 30161e73d17f · 2008-07-08T13:05:06.000-07:00
* qq/maint:
  run_command(): respect GIT_TRACE
diff --git a/run-command.c b/run-command.c
@@ -65,6 +65,8 @@ int start_command(struct child_process *cmd)
 		cmd->err = fderr[0];
 	}
 
+	trace_argv_printf(cmd->argv, "trace: run_command:");
+
 	cmd->pid = fork();
 	if (cmd->pid < 0) {
 		if (need_in)

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,8 @@ int start_command(struct child_process *cmd)`
`65`	`65`	`cmd->err = fderr[0];`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ trace_argv_printf(cmd->argv, "trace: run_command:");`
	`69`	`+`
`68`	`70`	`cmd->pid = fork();`
`69`	`71`	`if (cmd->pid < 0) {`
`70`	`72`	`if (need_in)`