diff options
| author |  Steffen Prohaska <prohaska@zib.de> | 2008-07-28 07:50:28 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-28 23:02:11 -0700 |
| commit | 108ac313f73499572c69b1b80514661b22a2d62e (patch) | |
| tree | 86af87786873b6f8f606e79e09d530a702a84507 | |
| parent | Refactor, adding prepare_git_cmd(const char **argv) (diff) | |
| download | tgif-108ac313f73499572c69b1b80514661b22a2d62e.tar.xz | |
run-command (Windows): Run dashless "git <cmd>"
We prefer running the dashless form, and POSIX side already does so; we
should use it in MinGW's start_command(), too.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Acked-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | run-command.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/run-command.c b/run-command.c index 6e29fdf9e2..a3b28a64dc 100644 --- a/run-command.c +++ b/run-command.c @@ -119,9 +119,8 @@ int start_command(struct child_process *cmd) } #else int s0 = -1, s1 = -1, s2 = -1; /* backups of stdin, stdout, stderr */ - const char *sargv0 = cmd->argv[0]; + const char **sargv = cmd->argv; char **env = environ; - struct strbuf git_cmd; if (cmd->no_stdin) { s0 = dup(0); @@ -165,9 +164,7 @@ int start_command(struct child_process *cmd) } if (cmd->git_cmd) { - strbuf_init(&git_cmd, 0); - strbuf_addf(&git_cmd, "git-%s", cmd->argv[0]); - cmd->argv[0] = git_cmd.buf; + cmd->argv = prepare_git_cmd(cmd->argv); } cmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, env); @@ -175,9 +172,9 @@ int start_command(struct child_process *cmd) if (cmd->env) free_environ(env); if (cmd->git_cmd) - strbuf_release(&git_cmd); + free(cmd->argv); - cmd->argv[0] = sargv0; + cmd->argv = sargv; if (s0 >= 0) dup2(s0, 0), close(s0); if (s1 >= 0) |