Re: [PATCH v2 3/3] connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config

2017-02-01 Thread Junio C Hamano
Johannes Schindelin writes: > On Fri, 27 Jan 2017, Junio C Hamano wrote: > >> IOW, I think it is acceptable to always split GIT_SSH_COMMAND into >> tokens before we realize that the user used the escape hatch and the >> splitting was a wasted effort. This is exactly because this thing >> is an e

Re: [PATCH v2 3/3] connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config

2017-02-01 Thread Johannes Schindelin
Hi Junio, On Fri, 27 Jan 2017, Junio C Hamano wrote: > IOW, I think it is acceptable to always split GIT_SSH_COMMAND into > tokens before we realize that the user used the escape hatch and the > splitting was a wasted effort. This is exactly because this thing > is an escape hatch that is expect

Re: [PATCH v2 3/3] connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config

2017-01-27 Thread Junio C Hamano
Just to save us extra round-trip. Junio C Hamano writes: >> +`GIT_SSH_VARIANT`:: >> +If this environment variable is set, it overrides the autodetection >> +of plink/tortoiseplink in the SSH command that 'git fetch' and 'git >> +push' use. It can be set to either `ssh`, `plink`, `put

Re: [PATCH v2 3/3] connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config

2017-01-27 Thread Johannes Schindelin
Hi Junio, On Thu, 26 Jan 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > diff --git a/connect.c b/connect.c > > index 9f750eacb6..7b4437578b 100644 > > --- a/connect.c > > +++ b/connect.c > > @@ -691,6 +691,24 @@ static const char *get_ssh_command(void) > > return NULL; > >

Re: [PATCH v2 3/3] connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config

2017-01-26 Thread Junio C Hamano
Johannes Schindelin writes: > diff --git a/Documentation/config.txt b/Documentation/config.txt > index af2ae4cc02..f2c210f0a0 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -1949,6 +1949,13 @@ Environment variable settings always override any > matches. The URLs t

[PATCH v2 3/3] connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config

2017-01-26 Thread Johannes Schindelin
From: Segev Finer This environment variable and configuration value allow to override the autodetection of plink/tortoiseplink in case that Git gets it wrong. [jes: wrapped overly-long lines, changed get_ssh_variant() to handle_ssh_variant() to accomodate the change from the putty/tortoiseplink