Merge branch 'qq/maint'

* qq/maint:
run_command(): respect GIT_TRACE

Conflicts:

run-command.c

diff --cc run-command.c
index 2ce8c2b2f057b712eb8c1223e3150af17d553afe,7068ec7e6d74af0cec233259b4b6e41a61ed5123..6e29fdf9e2968900d21ea48b992f292204621f19
--- 1/run-command.c
--- 2/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);