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

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 951b24661e45ffe8b11444166e3a6cc7a3c6e1d2..f9252d5591520c5ffeaea3880180e570f61be798 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -1129,7 +1129,7 @@ of clones and fetches.
            connection (or proxy, if configured)
 
          - `ssh`: git over ssh (including `host:path` syntax,
-           `git+ssh://`, etc).
+           `ssh://`, etc).
 
          - `http`: git over http, both "smart http" and "dumb http".
            Note that this does _not_ include `https`; if you want both,

diff --git a/connect.c b/connect.c
index 047863144f3f22fe36d178a00b116ee45c2e9e11..c53f3f1c55243feae8affbb268af689b35b9169f 100644 (file)
--- 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;

diff --git a/transport.c b/transport.c
index ca3cfa4b00d857603e6c72536fa6905a7ee2905f..095e61f0adde0741a3c95817f10df4b957d473ee 100644 (file)
--- 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.