From a58901c9bd2de40f6409a77a3f638106bdffaacd Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Sun, 15 Jun 2008 15:53:57 -0400 Subject: [PATCH] Fix custom ports with plink PuTTY requires -P while OpenSSH requires -p; if plink is detected as GIT_SSH, use the alternate flag. Signed-off-by: Edward Z. Yang Signed-off-by: Steffen Prohaska --- connect.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/connect.c b/connect.c index 574f42fa47..11fa151eb3 100644 --- a/connect.c +++ b/connect.c @@ -596,14 +596,17 @@ struct child_process *git_connect(int fd[2], const char *url_orig, die("command line too long"); conn->in = conn->out = -1; + /* be sure to increase this size if you add more args */ 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 (port) { - *arg++ = "-p"; + /* P is for PuTTY, p is for OpenSSH */ + *arg++ = putty ? "-P" : "-p"; *arg++ = port; } *arg++ = host;