aboutsummaryrefslogtreecommitdiff
path: root/transport.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-16 13:16:40 -0700
committerJunio C Hamano <gitster@pobox.com>2016-03-16 13:16:40 -0700
commit9e689802e393b614ab9343dba2cee3828950f3ec (patch)
treec2116919f414f39f53e64cb46cd89124cd1a57a4 /transport.c
parentc2c5f6b1e479f2c38e0e01345350620944e3527f (diff)
parent07c7782cc8e1f37c7255dfc69c5d0e3f4d4d728c (diff)
downloadgit-9e689802e393b614ab9343dba2cee3828950f3ec.tar.gz
git-9e689802e393b614ab9343dba2cee3828950f3ec.tar.xz
Merge branch 'cn/deprecate-ssh-git-url'
The two alternative ways to spell "ssh://" transport have been deprecated for a long time. The last mention of them has finally removed from the documentation. * cn/deprecate-ssh-git-url: Disown ssh+git and git+ssh
Diffstat (limited to 'transport.c')
-rw-r--r--transport.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/transport.c b/transport.c
index ca3cfa4b0..095e61f0a 100644
--- a/transport.c
+++ b/transport.c
@@ -678,8 +678,9 @@ struct transport *transport_get(struct remote *remote, const char *url)
|| starts_with(url, "file://")
|| starts_with(url, "git://")
|| starts_with(url, "ssh://")
- || starts_with(url, "git+ssh://")
- || starts_with(url, "ssh+git://")) {
+ || starts_with(url, "git+ssh://") /* deprecated - do not use */
+ || starts_with(url, "ssh+git://") /* deprecated - do not use */
+ ) {
/*
* These are builtin smart transports; "allowed" transports
* will be checked individually in git_connect.