diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2017-11-21 00:31:01 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-21 08:01:03 +0300 |
commit | 3fa5e0d07a979dfd1a1095a9dda4904c62189e00 (patch) | |
tree | c76b4807066e4268f1ff0ced5e2f9deb8b76b73a /t/t5603-clone-dirname.sh | |
parent | a3f5b66fac3b5f3b2c352c8086dbc3d476f9e3d4 (diff) |
ssh: 'simple' variant does not support --port
When trying to connect to an ssh:// URL with port explicitly specified
and the ssh command configured with GIT_SSH does not support such a
setting, it is less confusing to error out than to silently suppress
the port setting and continue.
This requires updating the GIT_SSH setting in t5603-clone-dirname.sh.
That test is about the directory name produced when cloning various
URLs. It uses an ssh wrapper that ignores all its arguments but does
not declare that it supports a port argument; update it to set
GIT_SSH_VARIANT=ssh to do so. (Real-life ssh wrappers that pass a
port argument to OpenSSH would also support -G and would not require
such an update.)
Reported-by: William Yan <wyan@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5603-clone-dirname.sh')
-rwxr-xr-x | t/t5603-clone-dirname.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t5603-clone-dirname.sh b/t/t5603-clone-dirname.sh index d5af758129..13b5e5eb9b 100755 --- a/t/t5603-clone-dirname.sh +++ b/t/t5603-clone-dirname.sh @@ -11,7 +11,9 @@ test_expect_success 'setup ssh wrapper' ' git upload-pack "$TRASH_DIRECTORY" EOF GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper" && + GIT_SSH_VARIANT=ssh && export GIT_SSH && + export GIT_SSH_VARIANT && export TRASH_DIRECTORY ' |