Merge branch 'tb/clone-ssh-with-colon-for-port'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 20:03:31 +0000 (12:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 20:03:32 +0000 (12:03 -0800)
Be more careful when parsing remote repository URL given in the
scp-style host:path notation.

* tb/clone-ssh-with-colon-for-port:
git_connect(): use common return point
connect.c: refactor url parsing
git_connect(): refactor the port handling for ssh
git fetch: support host:/~repo
t5500: add test cases for diag-url
git fetch-pack: add --diag-url
git_connect: factor out discovery of the protocol and its parts
git_connect: remove artificial limit of a remote command
t5601: add tests for ssh
t5601: remove clear_ssh, refactor setup_ssh_wrapper

1  2 
builtin/fetch-pack.c
connect.c
transport.c
Simple merge
diff --cc connect.c
Simple merge
diff --cc transport.c
Simple merge