[PATCH v3 4/4] connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config

2017-02-01 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, factored out and changed get_ssh_variant() to handle_ssh_variant() to accomodate the change from the put

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

2017-02-01 Thread Junio C Hamano
Johannes Schindelin writes: > index 2734b9a1ca..7f1f802396 100644 > --- a/connect.c > +++ b/connect.c > @@ -694,10 +694,14 @@ static const char *get_ssh_command(void) > static int handle_ssh_variant(const char *ssh_command, int is_cmdline, > int *port_option, int *nee

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

2017-02-01 Thread Junio C Hamano
Junio C Hamano writes: > I think restructuring along the line of 3/4 of this round is very > sensible in the longer term (if anything, handle_ssh_variant() now > really handles ssh variants in all cases, which makes it worthy of > its name, as opposed to the one in the previous round that only >

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

2017-02-01 Thread Johannes Schindelin
Hi Junio, On Wed, 1 Feb 2017, Junio C Hamano wrote: > Junio C Hamano writes: > > > I think restructuring along the line of 3/4 of this round is very > > sensible in the longer term (if anything, handle_ssh_variant() now > > really handles ssh variants in all cases, which makes it worthy of > >

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

2017-02-01 Thread Junio C Hamano
Johannes Schindelin writes: > That leaves the "putty" case in handle_ssh_variant(), does it not? Was it > not your specific objection that that is the case? Yup, you can remove that while you reroll. > No worries, I will let this simmer for a while. Your fixup has a lot of > duplicated code (so

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

2017-02-01 Thread Johannes Schindelin
Hi Junio, On Wed, 1 Feb 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > That leaves the "putty" case in handle_ssh_variant(), does it not? Was it > > not your specific objection that that is the case? > > Yup, you can remove that while you reroll. > > > No worries, I will let

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

2017-02-01 Thread Junio C Hamano
Junio C Hamano writes: > Johannes Schindelin writes: > >> That leaves the "putty" case in handle_ssh_variant(), does it not? Was it >> not your specific objection that that is the case? > > Yup, you can remove that while you reroll. > >> No worries, I will let this simmer for a while. Your fixup

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

2017-02-01 Thread Johannes Schindelin
Hi Junio, On Wed, 1 Feb 2017, Junio C Hamano wrote: > Junio C Hamano writes: > > > Johannes Schindelin writes: > > > >> That leaves the "putty" case in handle_ssh_variant(), does it not? Was it > >> not your specific objection that that is the case? > > > > Yup, you can remove that while you r