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.lorimer.id.au/gitweb.git/diff_plain/bed625540a0e1a4ba4da9962ed53c1d83d9bf509?hp=e67c9e3952a60dbf380cead5dae1d13fe9703f3c

Merge branch 'qq/maint'

* qq/maint:
run_command(): respect GIT_TRACE

Conflicts:

run-command.c
---

diff --git a/run-command.c b/run-command.c
index 2ce8c2b2f0..6e29fdf9e2 100644
--- 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:");
+
 #ifndef __MINGW32__
 	cmd->pid = fork();
 	if (!cmd->pid) {