mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +01:00
94b8ae5aca
When using the 'ssh' transport, the '-o' option is used to specify an environment variable which should be set on the remote end. This allows git to send additional information when contacting the server, requesting the use of a different protocol version via the 'GIT_PROTOCOL' environment variable like so: "-o SendEnv=GIT_PROTOCOL". Unfortunately not all ssh variants support the sending of environment variables to the remote end. To account for this, only use the '-o' option for ssh variants which are OpenSSH compliant. This is done by checking that the basename of the ssh command is 'ssh' or the ssh variant is overridden to be 'ssh' (via the ssh.variant config). Other options like '-p' and '-P', which are used to specify a specific port to use, or '-4' and '-6', which are used to indicate that IPV4 or IPV6 addresses should be used, may also not be supported by all ssh variants. Currently if an ssh command's basename wasn't 'plink' or 'tortoiseplink' git assumes that the command is an OpenSSH variant. Since user configured ssh commands may not be OpenSSH compliant, tighten this constraint and assume a variant of 'simple' if the basename of the command doesn't match the variants known to git. The new ssh variant 'simple' will only have the host and command to execute ([username@]host command) passed as parameters to the ssh command. Update the Documentation to better reflect the command-line options sent to ssh commands based on their variant. Reported-by: Jeffrey Yasskin <jyasskin@google.com> Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
294 lines
8.6 KiB
Bash
Executable file
294 lines
8.6 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='test git wire-protocol transition'
|
|
|
|
TEST_NO_CREATE_REPO=1
|
|
|
|
. ./test-lib.sh
|
|
|
|
# Test protocol v1 with 'git://' transport
|
|
#
|
|
. "$TEST_DIRECTORY"/lib-git-daemon.sh
|
|
start_git_daemon --export-all --enable=receive-pack
|
|
daemon_parent=$GIT_DAEMON_DOCUMENT_ROOT_PATH/parent
|
|
|
|
test_expect_success 'create repo to be served by git-daemon' '
|
|
git init "$daemon_parent" &&
|
|
test_commit -C "$daemon_parent" one
|
|
'
|
|
|
|
test_expect_success 'clone with git:// using protocol v1' '
|
|
GIT_TRACE_PACKET=1 git -c protocol.version=1 \
|
|
clone "$GIT_DAEMON_URL/parent" daemon_child 2>log &&
|
|
|
|
git -C daemon_child log -1 --format=%s >actual &&
|
|
git -C "$daemon_parent" log -1 --format=%s >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Client requested to use protocol v1
|
|
grep "clone> .*\\\0\\\0version=1\\\0$" log &&
|
|
# Server responded using protocol v1
|
|
grep "clone< version 1" log
|
|
'
|
|
|
|
test_expect_success 'fetch with git:// using protocol v1' '
|
|
test_commit -C "$daemon_parent" two &&
|
|
|
|
GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
|
|
fetch 2>log &&
|
|
|
|
git -C daemon_child log -1 --format=%s origin/master >actual &&
|
|
git -C "$daemon_parent" log -1 --format=%s >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Client requested to use protocol v1
|
|
grep "fetch> .*\\\0\\\0version=1\\\0$" log &&
|
|
# Server responded using protocol v1
|
|
grep "fetch< version 1" log
|
|
'
|
|
|
|
test_expect_success 'pull with git:// using protocol v1' '
|
|
GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
|
|
pull 2>log &&
|
|
|
|
git -C daemon_child log -1 --format=%s >actual &&
|
|
git -C "$daemon_parent" log -1 --format=%s >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Client requested to use protocol v1
|
|
grep "fetch> .*\\\0\\\0version=1\\\0$" log &&
|
|
# Server responded using protocol v1
|
|
grep "fetch< version 1" log
|
|
'
|
|
|
|
test_expect_success 'push with git:// using protocol v1' '
|
|
test_commit -C daemon_child three &&
|
|
|
|
# Push to another branch, as the target repository has the
|
|
# master branch checked out and we cannot push into it.
|
|
GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
|
|
push origin HEAD:client_branch 2>log &&
|
|
|
|
git -C daemon_child log -1 --format=%s >actual &&
|
|
git -C "$daemon_parent" log -1 --format=%s client_branch >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Client requested to use protocol v1
|
|
grep "push> .*\\\0\\\0version=1\\\0$" log &&
|
|
# Server responded using protocol v1
|
|
grep "push< version 1" log
|
|
'
|
|
|
|
stop_git_daemon
|
|
|
|
# Test protocol v1 with 'file://' transport
|
|
#
|
|
test_expect_success 'create repo to be served by file:// transport' '
|
|
git init file_parent &&
|
|
test_commit -C file_parent one
|
|
'
|
|
|
|
test_expect_success 'clone with file:// using protocol v1' '
|
|
GIT_TRACE_PACKET=1 git -c protocol.version=1 \
|
|
clone "file://$(pwd)/file_parent" file_child 2>log &&
|
|
|
|
git -C file_child log -1 --format=%s >actual &&
|
|
git -C file_parent log -1 --format=%s >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Server responded using protocol v1
|
|
grep "clone< version 1" log
|
|
'
|
|
|
|
test_expect_success 'fetch with file:// using protocol v1' '
|
|
test_commit -C file_parent two &&
|
|
|
|
GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
|
|
fetch 2>log &&
|
|
|
|
git -C file_child log -1 --format=%s origin/master >actual &&
|
|
git -C file_parent log -1 --format=%s >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Server responded using protocol v1
|
|
grep "fetch< version 1" log
|
|
'
|
|
|
|
test_expect_success 'pull with file:// using protocol v1' '
|
|
GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
|
|
pull 2>log &&
|
|
|
|
git -C file_child log -1 --format=%s >actual &&
|
|
git -C file_parent log -1 --format=%s >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Server responded using protocol v1
|
|
grep "fetch< version 1" log
|
|
'
|
|
|
|
test_expect_success 'push with file:// using protocol v1' '
|
|
test_commit -C file_child three &&
|
|
|
|
# Push to another branch, as the target repository has the
|
|
# master branch checked out and we cannot push into it.
|
|
GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
|
|
push origin HEAD:client_branch 2>log &&
|
|
|
|
git -C file_child log -1 --format=%s >actual &&
|
|
git -C file_parent log -1 --format=%s client_branch >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Server responded using protocol v1
|
|
grep "push< version 1" log
|
|
'
|
|
|
|
# Test protocol v1 with 'ssh://' transport
|
|
#
|
|
test_expect_success 'setup ssh wrapper' '
|
|
GIT_SSH="$GIT_BUILD_DIR/t/helper/test-fake-ssh" &&
|
|
export GIT_SSH &&
|
|
GIT_SSH_VARIANT=ssh &&
|
|
export GIT_SSH_VARIANT &&
|
|
export TRASH_DIRECTORY &&
|
|
>"$TRASH_DIRECTORY"/ssh-output
|
|
'
|
|
|
|
expect_ssh () {
|
|
test_when_finished '(cd "$TRASH_DIRECTORY" && rm -f ssh-expect && >ssh-output)' &&
|
|
echo "ssh: -o SendEnv=GIT_PROTOCOL myhost $1 '$PWD/ssh_parent'" >"$TRASH_DIRECTORY/ssh-expect" &&
|
|
(cd "$TRASH_DIRECTORY" && test_cmp ssh-expect ssh-output)
|
|
}
|
|
|
|
test_expect_success 'create repo to be served by ssh:// transport' '
|
|
git init ssh_parent &&
|
|
test_commit -C ssh_parent one
|
|
'
|
|
|
|
test_expect_success 'clone with ssh:// using protocol v1' '
|
|
GIT_TRACE_PACKET=1 git -c protocol.version=1 \
|
|
clone "ssh://myhost:$(pwd)/ssh_parent" ssh_child 2>log &&
|
|
expect_ssh git-upload-pack &&
|
|
|
|
git -C ssh_child log -1 --format=%s >actual &&
|
|
git -C ssh_parent log -1 --format=%s >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Server responded using protocol v1
|
|
grep "clone< version 1" log
|
|
'
|
|
|
|
test_expect_success 'fetch with ssh:// using protocol v1' '
|
|
test_commit -C ssh_parent two &&
|
|
|
|
GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
|
|
fetch 2>log &&
|
|
expect_ssh git-upload-pack &&
|
|
|
|
git -C ssh_child log -1 --format=%s origin/master >actual &&
|
|
git -C ssh_parent log -1 --format=%s >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Server responded using protocol v1
|
|
grep "fetch< version 1" log
|
|
'
|
|
|
|
test_expect_success 'pull with ssh:// using protocol v1' '
|
|
GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
|
|
pull 2>log &&
|
|
expect_ssh git-upload-pack &&
|
|
|
|
git -C ssh_child log -1 --format=%s >actual &&
|
|
git -C ssh_parent log -1 --format=%s >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Server responded using protocol v1
|
|
grep "fetch< version 1" log
|
|
'
|
|
|
|
test_expect_success 'push with ssh:// using protocol v1' '
|
|
test_commit -C ssh_child three &&
|
|
|
|
# Push to another branch, as the target repository has the
|
|
# master branch checked out and we cannot push into it.
|
|
GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
|
|
push origin HEAD:client_branch 2>log &&
|
|
expect_ssh git-receive-pack &&
|
|
|
|
git -C ssh_child log -1 --format=%s >actual &&
|
|
git -C ssh_parent log -1 --format=%s client_branch >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Server responded using protocol v1
|
|
grep "push< version 1" log
|
|
'
|
|
|
|
# Test protocol v1 with 'http://' transport
|
|
#
|
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
|
start_httpd
|
|
|
|
test_expect_success 'create repo to be served by http:// transport' '
|
|
git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
|
|
git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" config http.receivepack true &&
|
|
test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one
|
|
'
|
|
|
|
test_expect_success 'clone with http:// using protocol v1' '
|
|
GIT_TRACE_PACKET=1 GIT_TRACE_CURL=1 git -c protocol.version=1 \
|
|
clone "$HTTPD_URL/smart/http_parent" http_child 2>log &&
|
|
|
|
git -C http_child log -1 --format=%s >actual &&
|
|
git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Client requested to use protocol v1
|
|
grep "Git-Protocol: version=1" log &&
|
|
# Server responded using protocol v1
|
|
grep "git< version 1" log
|
|
'
|
|
|
|
test_expect_success 'fetch with http:// using protocol v1' '
|
|
test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two &&
|
|
|
|
GIT_TRACE_PACKET=1 git -C http_child -c protocol.version=1 \
|
|
fetch 2>log &&
|
|
|
|
git -C http_child log -1 --format=%s origin/master >actual &&
|
|
git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Server responded using protocol v1
|
|
grep "git< version 1" log
|
|
'
|
|
|
|
test_expect_success 'pull with http:// using protocol v1' '
|
|
GIT_TRACE_PACKET=1 git -C http_child -c protocol.version=1 \
|
|
pull 2>log &&
|
|
|
|
git -C http_child log -1 --format=%s >actual &&
|
|
git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Server responded using protocol v1
|
|
grep "git< version 1" log
|
|
'
|
|
|
|
test_expect_success 'push with http:// using protocol v1' '
|
|
test_commit -C http_child three &&
|
|
|
|
# Push to another branch, as the target repository has the
|
|
# master branch checked out and we cannot push into it.
|
|
GIT_TRACE_PACKET=1 git -C http_child -c protocol.version=1 \
|
|
push origin HEAD:client_branch && #2>log &&
|
|
|
|
git -C http_child log -1 --format=%s >actual &&
|
|
git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s client_branch >expect &&
|
|
test_cmp expect actual &&
|
|
|
|
# Server responded using protocol v1
|
|
grep "git< version 1" log
|
|
'
|
|
|
|
stop_httpd
|
|
|
|
test_done
|