Re: [PATCH 06/12] connect: Fix custom ports with plink (Putty's ssh)
From: Johannes Sixt <hidden>
Date: 2016-06-15 22:44:52
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 06/12] connect: Fix custom ports with plink (Putty's ssh) · Edward Z. Yang <hidden>
- 2016-06-15 · Re: [PATCH 06/12] connect: Fix custom ports with plink (Putty's ssh) · Johannes Schindelin <hidden>
- 2016-06-15 · Re: [PATCH 06/12] connect: Fix custom ports with plink (Putty's ssh) · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 06/12] connect: Fix custom ports with plink (Putty's ssh) · Steffen Prohaska <hidden>
- 2016-06-15 · Re: [PATCH 06/12] connect: Fix custom ports with plink (Putty's ssh) · Clifford Caoile <hidden>
On Mittwoch, 2. Juli 2008, Steffen Prohaska wrote:
quoted hunk ↗ jump to hunk
From: Edward Z. Yang <redacted> PuTTY requires -P while OpenSSH requires -p; if plink is detected as GIT_SSH, use the alternate flag. Signed-off-by: Edward Z. Yang <redacted> Signed-off-by: Steffen Prohaska <redacted> --- connect.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)diff --git a/connect.c b/connect.c index 574f42f..0d007f3 100644 --- a/connect.c +++ b/connect.c@@ -599,11 +599,13 @@ struct child_process *git_connect(int fd[2], constchar *url_orig, 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;
What about installing a wrapper script, plinkssh, that does this: #!/bin/bash if test "$1" = -p; then port="-P $2" shift; shift fi exec plink $port "$@" and require plink users to set GIT_SSH=plinkssh? -- Hannes