diff options
| author |  Carlos Martín Nieto <cmn@dwim.me> | 2016-02-15 15:29:06 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-03-09 13:54:38 -0800 |
| commit | 07c7782cc8e1f37c7255dfc69c5d0e3f4d4d728c (patch) | |
| tree | 997305e5d56581238bea1be4f934d5ad9b52cabd | |
| parent | Git 2.7.1 (diff) | |
| download | tgif-07c7782cc8e1f37c7255dfc69c5d0e3f4d4d728c.tar.xz | |
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>
| -rw-r--r-- | Documentation/git.txt | 2 | ||||
| -rw-r--r-- | connect.c | 4 | ||||
| -rw-r--r-- | transport.c | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index d987ad20c9..2f90635d5c 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 @@ -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 67f366687c..908e08b9ae 100644 --- a/transport.c +++ b/transport.c @@ -1001,8 +1001,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. |