summaryrefslogtreecommitdiff
path: root/run-command.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-11 20:54:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-11 20:54:28 (GMT)
commit4553d58f374c6bfcae6b4be528bbf11c18a7efe5 (patch)
tree44877f9283ffa304e6a805a56f2270fe21b892c7 /run-command.c
parent7b575f3c387f7fd1b204af71a02b3faa74fb7798 (diff)
parentf9a2743c3529baab6de650aa3e3eb96de9386fec (diff)
downloadgit-4553d58f374c6bfcae6b4be528bbf11c18a7efe5.zip
git-4553d58f374c6bfcae6b4be528bbf11c18a7efe5.tar.gz
git-4553d58f374c6bfcae6b4be528bbf11c18a7efe5.tar.bz2
Merge branch 'jl/maint-submodule-gitfile-awareness'
* jl/maint-submodule-gitfile-awareness: Windows: start_command: Support non-NULL dir in struct child_process
Diffstat (limited to 'run-command.c')
-rw-r--r--run-command.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/run-command.c b/run-command.c
index c8d5379..eb5c575 100644
--- a/run-command.c
+++ b/run-command.c
@@ -342,8 +342,6 @@ fail_pipe:
else if (cmd->out > 1)
fhout = dup(cmd->out);
- if (cmd->dir)
- die("chdir in start_command() not implemented");
if (cmd->env)
env = make_augmented_environ(cmd->env);
@@ -353,7 +351,7 @@ fail_pipe:
cmd->argv = prepare_shell_cmd(cmd->argv);
}
- cmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, env,
+ cmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, env, cmd->dir,
fhin, fhout, fherr);
failed_errno = errno;
if (cmd->pid < 0 && (!cmd->silent_exec_failure || errno != ENOENT))