summaryrefslogtreecommitdiff
path: root/connect.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 /connect.c
parentc2c5f6b1e479f2c38e0e01345350620944e3527f (diff)
parent07c7782cc8e1f37c7255dfc69c5d0e3f4d4d728c (diff)
downloadgit-9e689802e393b614ab9343dba2cee3828950f3ec.tar.gz
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 'connect.c')
-rw-r--r--connect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/connect.c b/connect.c
index 047863144f..c53f3f1c55 100644
--- a/connect.c
+++ b/connect.c
@@ -267,9 +267,9 @@ static enum protocol get_protocol(const char *name)
return PROTO_SSH;
if (!strcmp(name, "git"))
return PROTO_GIT;
- if (!strcmp(name, "git+ssh"))
+ if (!strcmp(name, "git+ssh")) /* deprecated - do not use */
return PROTO_SSH;
- if (!strcmp(name, "ssh+git"))
+ if (!strcmp(name, "ssh+git")) /* deprecated - do not use */
return PROTO_SSH;
if (!strcmp(name, "file"))
return PROTO_FILE;