diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/connect.c | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/connect.c')
| -rw-r--r-- | third_party/git/connect.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/third_party/git/connect.c b/third_party/git/connect.c index b6451ab5e890..2778481264d0 100644 --- a/third_party/git/connect.c +++ b/third_party/git/connect.c @@ -511,7 +511,7 @@ int url_is_local_not_ssh(const char *url) const char *colon = strchr(url, ':'); const char *slash = strchr(url, '/'); return !colon || (slash && slash < colon) || - (has_dos_drive_prefix(url) && is_valid_path(url)); + has_dos_drive_prefix(url); } static const char *prot_name(enum protocol protocol) @@ -915,10 +915,6 @@ static enum protocol parse_connect_url(const char *url_orig, char **ret_host, if (protocol == PROTO_LOCAL) path = end; - else if (protocol == PROTO_FILE && *host != '/' && - !has_dos_drive_prefix(host) && - offset_1st_component(host - 2) > 1) - path = host - 2; /* include the leading "//" */ else if (protocol == PROTO_FILE && has_dos_drive_prefix(end)) path = end; /* "file://$(pwd)" may be "file://C:/projects/repo" */ else |