diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2010-04-11 22:40:12 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-11 13:48:46 -0700 |
| commit | f9a2743c3529baab6de650aa3e3eb96de9386fec (patch) | |
| tree | c639acad982fb1fb3fa1f80915b6944361421a46 /run-command.c | |
| parent | eee49b6ce4b7b3fed28794676c67ad3609f658ac (diff) | |
| download | git-f9a2743c3529baab6de650aa3e3eb96de9386fec.tar.gz | |
Windows: start_command: Support non-NULL dir in struct child_process
A caller of start_command can set the member 'dir' to a directory to
request that the child process starts with that directory as CWD. The first
user of this feature was added recently in eee49b6 (Teach diff --submodule
and status to handle .git files in submodules).
On Windows, we have been lazy and had not implemented support for this
feature, yet. This fixes the shortcoming.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'run-command.c')
| -rw-r--r-- | run-command.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/run-command.c b/run-command.c index 2feb493951..db30cd5fe2 100644 --- a/run-command.c +++ b/run-command.c @@ -335,8 +335,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); @@ -346,7 +344,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)) |