Disown ssh+git and git+ssh
Some people argue that these were silly from the beginning (see http://thread.gmane.org/gmane.comp.version-control.git/285590/focus=285601 for example), but we have to support them for compatibility. That doesn't mean we have to show them in the documentation. These were already left out of the main list, but a reference in the main manpage was left, so remove that. Also add a note to discourage their use if anybody goes looking for them in the source code. Signed-off-by: Carlos Martín Nieto <cmn@dwim.me> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Carlos Martín Nieto committed
Feb 15, 2016 at 15:29 UTC
07c7782cc8e1f37c7255dfc69c5d0e3f4d4d728c
3 files changed
+6
-5
Documentation/git.txt
+1
-1
@@ -1122,7 +1122,7 @@ of clones and fetches.
1122
connection (or proxy, if configured)
1123
1124
- `ssh`: git over ssh (including `host:path` syntax,
1125
- `git+ssh://`, etc).
1125
+ `ssh://`, etc).
1126
1127
- `rsync`: git over rsync
1128
connect.c
+2
-2
@@ -267,9 +267,9 @@ static enum protocol get_protocol(const char *name)
267
return PROTO_SSH;
268
if (!strcmp(name, "git"))
269
return PROTO_GIT;
270
- if (!strcmp(name, "git+ssh"))
270
+ if (!strcmp(name, "git+ssh")) /* deprecated - do not use */
271
return PROTO_SSH;
272
- if (!strcmp(name, "ssh+git"))
272
+ if (!strcmp(name, "ssh+git")) /* deprecated - do not use */
273
return PROTO_SSH;
274
if (!strcmp(name, "file"))
275
return PROTO_FILE;
transport.c
+3
-2
@@ -1001,8 +1001,9 @@ struct transport *transport_get(struct remote *remote, const char *url)
1001
|| starts_with(url, "file://")
1002
|| starts_with(url, "git://")
1003
|| starts_with(url, "ssh://")
1004
- || starts_with(url, "git+ssh://")
1005
- || starts_with(url, "ssh+git://")) {
1004
+ || starts_with(url, "git+ssh://") /* deprecated - do not use */
1005
+ || starts_with(url, "ssh+git://") /* deprecated - do not use */
1006
+ ) {
1007
/*
1008
* These are builtin smart transports; "allowed" transports
1009
* will be checked individually in git_connect.