summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cache.h1
-rw-r--r--connect.c16
2 files changed, 16 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 2e36cc5..677c6ac 100644
--- a/cache.h
+++ b/cache.h
@@ -340,6 +340,7 @@ extern int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
int nr_refspec, char **refspec, int all);
extern int get_ack(int fd, unsigned char *result_sha1);
extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match, int ignore_funny);
+extern int server_supports(const char *feature);
extern struct packed_git *parse_pack_index(unsigned char *sha1);
extern struct packed_git *parse_pack_index_file(const unsigned char *sha1,
diff --git a/connect.c b/connect.c
index b171c5d..5cc49f9 100644
--- a/connect.c
+++ b/connect.c
@@ -8,6 +8,8 @@
#include <arpa/inet.h>
#include <netdb.h>
+static char *server_capabilities = "";
+
/*
* 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,11 @@ struct ref **get_remote_heads(int in, struct ref **list,
return list;
}
+int server_supports(const char *feature)
+{
+ return strstr(feature, server_capabilities) != NULL;
+}
+
int get_ack(int fd, unsigned char *result_sha1)
{
static char line[1000];