git clone: is an URL local or ssh
PATCH v4 1/1 git clone: is an URL local or ssh
Commit 8d3d28f5 added test cases for URLs which should be ssh.
Add more tests testing all the combinations:
-IPv4 or IPv6
-path starting with "/" or with "/~"
-with and without the ssh:// scheme
Add tests for ssh:// with port number.
When a git repository "foo:bar" exist, git clone will call absolute_path() and git_connect() will be called with something like "/home/user/projects/foo:bar"
Tighten the test and use "foo:bar" instead of "./foo:bar", refactor clear_ssh() and expect_ssh() into test_clone_url().
"git clone foo/bar:baz" should not be ssh:
Make the rule
"if there is a slash before the first colon, it is not ssh" more strict by using the same is_local() in both connect.c and transport.c. Add a test case.
Bug fixes for corner cases:
- Handle clone of [::1]:/~repo correctly (2e7766655):
Git should call "ssh ::1 ~repo", not ssh ::1 /~repo This was caused by looking at (host != url), which never worked for host names with literal IPv6 adresses, embedded by [] Support for the [] URLs was introduced in 356bece0a.
- Do not tamper local URLs starting with '[' which have a ']'
Bug fix for msygit in t5601 : use $PWD insted of $(pwd)
---
Changes since V3:
- Integrated Peffs suggestions in t5601
(Remove clear_ssh)
- Decide early if it is ssl or local in connect.c
- Use "git fetch" instead of "git clone" in t5601:
clone use absolute_path() (adding a / before :), fetch does not
- Add a test for dos_drive "C:temp" for msys
- Make tests work for msys by using $PWD instead of $(pwd) (file://$PWD)
connect.c | 50 ++++++++++++++++-------- connect.h | 1 + t/t5601-clone.sh | 117 ++++++++++++++++++++++++++++++++++++++++++++----------- transport.c | 8 ---- 4 files changed, 130 insertions(+), 46 deletions(-)
connect.c +34 -16
@@ -547,6 +547,25 @@ static char *get_port(char *host)static struct child_process no_fork; +int is_local (const char *url) +{ +const char *colon =strchr (url,':' ); +const char *slash =strchr (url,'/' ); +if (has_dos_drive_prefix (url)) +return 1 ; +if (!colon) +return 1 ; +if (slash && slash < colon) +return 1 ; +if (url[0 ] =='[' ) { +const char *end =strchr (url +1 ,']' ); +if (!end) +return 1 ; +return is_local (end); + } +return 0 ; +} +/* * This returns a dummy child_process if the transport protocol does not * need fork(2), or a struct child_process object if it does. Once done,
@@ -564,7 +583,7 @@ struct child_process *git_connect(int fd[2], const char *url_orig,char *url;char *host, *path;char *end; -int c; +int separator;struct child_process *conn = &no_fork;enum protocol protocol =PROTO_LOCAL ;int free_path =0 ;
@@ -587,17 +606,19 @@ struct child_process *git_connect(int fd[2], const char *url_orig, *host ='\0' ; protocol =get_protocol (url); host +=3 ; - c ='/' ; + separator ='/' ; }else { host = url; - c =':' ; + protocol =is_local (url) ?PROTO_LOCAL :PROTO_SSH ; + separator =':' ; }/* * Don't do destructive transforms with git:// as that * protocol code does '[]' unwrapping of its own. +* Don't change local URLs */ -if (host[0 ] =='[' ) { +if (protocol !=PROTO_LOCAL && host[0 ] =='[' ) { end =strchr (host +1 ,']' );if (end) {if (protocol !=PROTO_GIT ) {
@@ -610,17 +631,14 @@ struct child_process *git_connect(int fd[2], const char *url_orig, }else end = host; - path =strchr (end, c); -if (path && !has_dos_drive_prefix (end)) { -if (c ==':' ) { -if (host != url || path <strchrnul (host,'/' )) { - protocol =PROTO_SSH ; - *path++ ='\0' ; - }else /* '/' in the host part, assume local path */ - path = end; + path =strchr (end, separator); +if (separator ==':' ) { +if (path && protocol ==PROTO_SSH ) { + *path++ ='\0' ; + }else {/* assume local path */ + path = end; } - }else - path = end; + }if (!path || !*path)die ("No path specified. See 'man git-pull' for valid url syntax" );
@@ -629,7 +647,7 @@ struct child_process *git_connect(int fd[2], const char *url_orig,* null-terminate hostname and point path to ~ for URL's like this: * ssh://host.xz/~user/repo */ -if (protocol !=PROTO_LOCAL && host != url) { +if (protocol !=PROTO_LOCAL && separator =='/' ) {char *ptr = path;if (path[1 ] =='~' ) path++;
@@ -644,7 +662,7 @@ struct child_process *git_connect(int fd[2], const char *url_orig,/* * Add support for ssh port: ssh://host.xy:<port>/... */ -if (protocol ==PROTO_SSH && host != url) +if (protocol ==PROTO_SSH && separator =='/' ) port =get_port (end);if (protocol ==PROTO_GIT ) {
connect.h +1 -0
@@ -5,6 +5,7 @@extern struct child_process *git_connect (int fd[2 ],const char *url,const char *prog,int flags);extern int finish_connect (struct child_process *conn);extern int git_connection_is_socket (struct child_process *conn); +extern int is_local (const char *url);extern int server_supports (const char *feature);extern int parse_feature_request (const char *features,const char *feature);extern const char *server_feature_value (const char *feature,int *len_ret);
t/t5601-clone.sh +95 -22
164 lines not on this page · raw message
transport.c +0 -8
@@ -885,14 +885,6 @@ void transport_take_over(struct transport *transport, transport->cannot_reuse =1 ; } -static int is_local (const char *url) -{ -const char *colon =strchr (url,':' ); -const char *slash =strchr (url,'/' ); -return !colon || (slash && slash < colon) || -has_dos_drive_prefix (url); -} -static int is_file (const char *url) {struct stat buf;
Signature · 1 line
1.8.4.457.g424cb08