diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2013-10-14 11:06:57 -0700 |
---|---|---|
committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-10-14 11:06:57 -0700 |
commit | cabb411fcf6a0a0f5058f2fee0f628e9a16a6fcb (patch) | |
tree | 765637b99a2226314e7680126e97daf766c7f1ba /t | |
parent | 13f17f338c7edfdd60dc152c82f6393a3c4bc381 (diff) | |
parent | 8d3d28f5dba94a15a79975e4adc909c295c80d80 (diff) | |
download | git-cabb411fcf6a0a0f5058f2fee0f628e9a16a6fcb.tar.gz git-cabb411fcf6a0a0f5058f2fee0f628e9a16a6fcb.tar.xz |
Merge branch 'nd/clone-local-with-colon'
* nd/clone-local-with-colon:
clone: tighten "local paths with colons" check a bit
Diffstat (limited to 't')
-rwxr-xr-x | t/t5601-clone.sh | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index 0629149ed..a3e3d489e 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -280,9 +280,53 @@ test_expect_success 'clone checking out a tag' ' test_cmp fetch.expected fetch.actual ' +test_expect_success 'setup ssh wrapper' ' + write_script "$TRASH_DIRECTORY/ssh-wrapper" <<-\EOF && + echo >>"$TRASH_DIRECTORY/ssh-output" "ssh: $*" && + # throw away all but the last argument, which should be the + # command + while test $# -gt 1; do shift; done + eval "$1" + EOF + + GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper" && + export GIT_SSH && + export TRASH_DIRECTORY +' + +clear_ssh () { + >"$TRASH_DIRECTORY/ssh-output" +} + +expect_ssh () { + { + case "$1" in + none) + ;; + *) + echo "ssh: $1 git-upload-pack '$2'" + esac + } >"$TRASH_DIRECTORY/ssh-expect" && + (cd "$TRASH_DIRECTORY" && test_cmp ssh-expect ssh-output) +} + +test_expect_success 'cloning myhost:src uses ssh' ' + clear_ssh && + git clone myhost:src ssh-clone && + expect_ssh myhost src +' + test_expect_success NOT_MINGW,NOT_CYGWIN 'clone local path foo:bar' ' + clear_ssh && cp -R src "foo:bar" && - git clone "./foo:bar" foobar + git clone "./foo:bar" foobar && + expect_ssh none +' + +test_expect_success 'bracketed hostnames are still ssh' ' + clear_ssh && + git clone "[myhost:123]:src" ssh-bracket-clone && + expect_ssh myhost:123 src ' test_done |