[PATCH] Disown ssh+git and git+ssh
- From
Carlos Martín Nieto <cmn@dwim.me>
- Date
- Feb 12, 2016, 15:09 UTC
- Message-ID
- <1455289777-186690-1-git-send-email-cmn@dwim.me>
These were silly from the beginning, 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. --- Documentation/git.txt | 2 +- connect.c | 4 ++++ transport.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/Documentation/git.txt b/Documentation/git.txt index d987ad2..2f90635 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -1122,7 +1122,7 @@ of clones and fetches. connection (or proxy, if configured) - `ssh`: git over ssh (including `host:path` syntax, - `git+ssh://`, etc). + `ssh://`, etc). - `rsync`: git over rsync diff --git a/connect.c b/connect.c index fd7ffe1..4f96424 100644 --- a/connect.c +++ b/connect.c @@ -267,6 +267,10 @@ static enum protocol get_protocol(const char *name) return PROTO_SSH; if (!strcmp(name, "git")) return PROTO_GIT; + /* + * These ssh schemes remain supported for compat but are + * undocumented and their use is discouraged + */ if (!strcmp(name, "git+ssh")) return PROTO_SSH; if (!strcmp(name, "ssh+git")) diff --git a/transport.c b/transport.c index 9ae7184..f5ae707 100644 --- a/transport.c +++ b/transport.c @@ -1002,6 +1002,10 @@ struct transport *transport_get(struct remote *remote, const char *url) || starts_with(url, "file://") || starts_with(url, "git://") || starts_with(url, "ssh://") + /* + * These ssh schemes remain supported for compat but are + * undocumented and their use is discouraged + */ || starts_with(url, "git+ssh://") || starts_with(url, "ssh+git://")) { /*
-- 2.7.0