global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 18:33:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'eya/plink' into devel

Browse Source
This commit is contained in:
Steffen Prohaska
2008-06-19 07:29:35 +02:00
parent 370dbd0c74 33227548ba
commit 239d68bda5
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
connect.c
View File

@@ -597,20 +597,13 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
conn->in = conn->out = -1;
/* be sure to increase this size if you add more args */
conn->argv = arg = xcalloc(8, sizeof(*arg));
conn->argv = arg = xcalloc(6, sizeof(*arg));
if (protocol == PROTO_SSH) {
const char *ssh = getenv("GIT_SSH");
int putty = ssh && strstr(ssh, "plink");
if (!ssh) ssh = "ssh";
*arg++ = ssh;
if (putty) {
/* stdin forwarding doesn't work, so give informative error messages
* (-v) and don't hang (-batch).
*/
*arg++ = "-batch";
*arg++ = "-v";
}
if (port) {
/* P is for PuTTY, p is for OpenSSH */
*arg++ = putty ? "-P" : "-p";