X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=connect.c;h=b171c5dbc8c9ecc32f6738d17c339858cbbf76f1;hb=f6ab5bb265ac821d9aab3755059eeadb615f512b;hp=39d320ce280f4448b52865cc5386acc2099744c7;hpb=49744d63e9c5ffdfb4677bd3aaeafb3371c3fdc1;p=git.git

diff --git a/connect.c b/connect.c
index 39d320ce..b171c5db 100644
--- a/connect.c
+++ b/connect.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "pkt-line.h"
 #include "quote.h"
+#include "refs.h"
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -10,7 +11,8 @@
 /*
  * Read all the refs from the other end
  */
-struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match)
+struct ref **get_remote_heads(int in, struct ref **list,
+			      int nr_match, char **match, int ignore_funny)
 {
 	*list = NULL;
 	for (;;) {
@@ -29,6 +31,11 @@ struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **ma
 		if (len < 42 || get_sha1_hex(buffer, old_sha1) || buffer[40] != ' ')
 			die("protocol error: expected sha/ref, got '%s'", buffer);
 		name = buffer + 41;
+
+		if (ignore_funny && 45 < len && !memcmp(name, "refs/", 5) &&
+		    check_ref_format(name + 5))
+			continue;
+
 		if (nr_match && !path_match(name, nr_match, match))
 			continue;
 		ref = xcalloc(1, sizeof(*ref) + len - 40);
@@ -284,6 +291,10 @@ static enum protocol get_protocol(const char *name)
 		return PROTO_SSH;
 	if (!strcmp(name, "git"))
 		return PROTO_GIT;
+	if (!strcmp(name, "git+ssh"))
+		return PROTO_SSH;
+	if (!strcmp(name, "ssh+git"))
+		return PROTO_SSH;
 	die("I don't handle protocol '%s'", name);
 }
 
@@ -397,7 +408,7 @@ static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
 
 		memset(&sa, 0, sizeof sa);
 		sa.sin_family = he->h_addrtype;
-		sa.sin_port = nport;
+		sa.sin_port = htons(nport);
 		memcpy(&sa.sin_addr, ap, he->h_length);
 
 		if (connect(sockfd, (struct sockaddr *)&sa, sizeof sa) < 0) {