Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Mar 16, 2016
2 parents c2c5f6b + 07c7782 commit 9e68980
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Documentation/git.txt
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions connect.c
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions transport.c
Expand Up @@ -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.
Expand Down

0 comments on commit 9e68980

Please sign in to comment.