git-config-set: support selecting values by non-matching regex

[git.git] / connect.c

diff --git a/connect.c b/connect.c
index b171c5d..73187a1 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -8,6 +8,8 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
+static char *server_capabilities = NULL;
+
 /*
  * Read all the refs from the other end
  */
@@ -20,7 +22,7 @@ struct ref **get_remote_heads(int in, struct ref **list,
                unsigned char old_sha1[20];
                static char buffer[1000];
                char *name;
-               int len;
+               int len, name_len;
 
                len = packet_read_line(in, buffer, sizeof(buffer));
                if (!len)
@@ -36,6 +38,13 @@ struct ref **get_remote_heads(int in, struct ref **list,
                    check_ref_format(name + 5))
                        continue;
 
+               name_len = strlen(name);
+               if (len != name_len + 41) {
+                       if (server_capabilities)
+                               free(server_capabilities);
+                       server_capabilities = strdup(name + name_len + 1);
+               }
+
                if (nr_match && !path_match(name, nr_match, match))
                        continue;
                ref = xcalloc(1, sizeof(*ref) + len - 40);
@@ -47,6 +56,12 @@ struct ref **get_remote_heads(int in, struct ref **list,
        return list;
 }
 
+int server_supports(const char *feature)
+{
+       return server_capabilities &&
+               strstr(server_capabilities, feature) != NULL;
+}
+
 int get_ack(int fd, unsigned char *result_sha1)
 {
        static char line[1000];
@@ -59,8 +74,11 @@ int get_ack(int fd, unsigned char *result_sha1)
        if (!strcmp(line, "NAK"))
                return 0;
        if (!strncmp(line, "ACK ", 3)) {
-               if (!get_sha1_hex(line+4, result_sha1))
+               if (!get_sha1_hex(line+4, result_sha1)) {
+                       if (strstr(line+45, "continue"))
+                               return 2;
                        return 1;
+               }
        }
        die("git-fetch_pack: expected ACK/NAK, got '%s'", line);
 }
@@ -436,34 +454,45 @@ static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
 int git_connect(int fd[2], char *url, const char *prog)
 {
        char command[1024];
-       char *host, *path;
-       char *colon;
+       char *host, *path = url;
+       char *colon = NULL;
        int pipefd[2][2];
        pid_t pid;
-       enum protocol protocol;
-
-       host = NULL;
-       path = url;
-       colon = strchr(url, ':');
-       protocol = PROTO_LOCAL;
-       if (colon) {
-               *colon = 0;
+       enum protocol protocol = PROTO_LOCAL;
+
+       host = strstr(url, "://");
+       if(host) {
+               *host = '\0';
+               protocol = get_protocol(url);
+               host += 3;
+               path = strchr(host, '/');
+       }
+       else {
                host = url;
-               path = colon+1;
-               protocol = PROTO_SSH;
-               if (!memcmp(path, "//", 2)) {
-                       char *slash = strchr(path + 2, '/');
-                       if (slash) {
-                               int nr = slash - path - 2;
-                               memmove(path, path+2, nr);
-                               path[nr] = 0;
-                               protocol = get_protocol(url);
-                               host = path;
-                               path = slash;
-                       }
+               if ((colon = strchr(host, ':'))) {
+                       protocol = PROTO_SSH;
+                       *colon = '\0';
+                       path = colon + 1;
                }
        }
 
+       if (!path || !*path)
+               die("No path specified. See 'man git-pull' for valid url syntax");
+
+       /*
+        * null-terminate hostname and point path to ~ for URL's like this:
+        *    ssh://host.xz/~user/repo
+        */
+       if (protocol != PROTO_LOCAL && host != url) {
+               char *ptr = path;
+               if (path[1] == '~')
+                       path++;
+               else
+                       path = strdup(ptr);
+
+               *ptr = '\0';
+       }
+
        if (protocol == PROTO_GIT)
                return git_tcp_connect(fd, prog, host, path);