diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:14 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-02-27 13:57:15 -0800 |
commit | be6ab596a8e63f0bd6a5da0a97db78e0f0e41839 (patch) | |
tree | 79e69e59ebec47d164fdc94a46de88ca67b645e8 /t/t9818-git-p4-block.sh | |
parent | Merge branch 'js/rebase-helper' (diff) | |
parent | connect.c: stop conflating ssh command names and overrides (diff) | |
download | tgif-be6ab596a8e63f0bd6a5da0a97db78e0f0e41839.tar.xz |
Merge branch 'sf/putty-w-args'
The command line options for ssh invocation needs to be tweaked for
some implementations of SSH (e.g. PuTTY plink wants "-P <port>"
while OpenSSH wants "-p <port>" to specify port to connect to), and
the variant was guessed when GIT_SSH environment variable is used
to specify it. The logic to guess now applies to the command
specified by the newer GIT_SSH_COMMAND and also core.sshcommand
configuration variable, and comes with an escape hatch for users to
deal with misdetected cases.
* sf/putty-w-args:
connect.c: stop conflating ssh command names and overrides
connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config
git_connect(): factor out SSH variant handling
connect: rename tortoiseplink and putty variables
connect: handle putty/plink also in GIT_SSH_COMMAND
Diffstat (limited to 't/t9818-git-p4-block.sh')
0 files changed, 0 insertions, 0 deletions