X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=upload-pack.c;h=686445ec9b0a685e8325bb4d62abba90a6b3ad07;hb=1bd8c8f00b1c7facb67c99047fe777b53f2c49ff;hp=c3abf7ba659b9f4957740486b8bb7aca5b1c8471;hpb=0f8fdc3958ad0cb7c740b76189f98307eebcd64b;p=git.git

diff --git a/upload-pack.c b/upload-pack.c
index c3abf7ba..686445ec 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -8,9 +8,11 @@
 static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn] <dir>";
 
 #define THEY_HAVE (1U << 0)
+#define OUR_REF (1U << 1)
+#define WANTED (1U << 2)
 #define MAX_HAS 256
 #define MAX_NEEDS 256
-static int nr_has = 0, nr_needs = 0, multi_ack = 0;
+static int nr_has = 0, nr_needs = 0, multi_ack = 0, nr_our_refs = 0;
 static unsigned char has_sha1[MAX_HAS][20];
 static unsigned char needs_sha1[MAX_NEEDS][20];
 static unsigned int timeout = 0;
@@ -31,6 +33,7 @@ static void create_pack_file(void)
 {
 	int fd[2];
 	pid_t pid;
+	int create_full_pack = (nr_our_refs == nr_needs && !nr_has);
 
 	if (pipe(fd) < 0)
 		die("git-upload-pack: unable to create pipe");
@@ -45,8 +48,8 @@ static void create_pack_file(void)
 		char *buf;
 		char **p;
 
-		if (MAX_NEEDS <= nr_needs)
-			args = nr_has + 10;
+		if (create_full_pack)
+			args = 10;
 		else
 			args = nr_has + nr_needs + 5;
 		argv = xmalloc(args * sizeof(char *));
@@ -59,7 +62,7 @@ static void create_pack_file(void)
 		close(fd[1]);
 		*p++ = "git-rev-list";
 		*p++ = "--objects";
-		if (MAX_NEEDS <= nr_needs)
+		if (create_full_pack || MAX_NEEDS <= nr_needs)
 			*p++ = "--all";
 		else {
 			for (i = 0; i < nr_needs; i++) {
@@ -68,12 +71,13 @@ static void create_pack_file(void)
 				buf += 41;
 			}
 		}
-		for (i = 0; i < nr_has; i++) {
-			*p++ = buf;
-			*buf++ = '^';
-			memcpy(buf, sha1_to_hex(has_sha1[i]), 41);
-			buf += 41;
-		}
+		if (!create_full_pack)
+			for (i = 0; i < nr_has; i++) {
+				*p++ = buf;
+				*buf++ = '^';
+				memcpy(buf, sha1_to_hex(has_sha1[i]), 41);
+				buf += 41;
+			}
 		*p++ = NULL;
 		execvp("git-rev-list", argv);
 		die("git-upload-pack: unable to exec git-rev-list");
@@ -93,7 +97,9 @@ static int got_sha1(char *hex, unsigned char *sha1)
 		return 0;
 	if (nr_has < MAX_HAS) {
 		struct object *o = lookup_object(sha1);
-		if (!o || (!o->parsed && !parse_object(sha1)))
+		if (!(o && o->parsed))
+			o = parse_object(sha1);
+		if (!o)
 			die("oops (%s)", sha1_to_hex(sha1));
 		if (o->type == commit_type) {
 			struct commit_list *parents;
@@ -113,7 +119,7 @@ static int got_sha1(char *hex, unsigned char *sha1)
 static int get_common_commits(void)
 {
 	static char line[1000];
-	unsigned char sha1[20];
+	unsigned char sha1[20], last_sha1[20];
 	int len;
 
 	track_object_refs = 0;
@@ -124,23 +130,31 @@ static int get_common_commits(void)
 		reset_timeout();
 
 		if (!len) {
-			if (multi_ack || nr_has == 0)
+			if (nr_has == 0 || multi_ack)
 				packet_write(1, "NAK\n");
 			continue;
 		}
 		len = strip(line, len);
 		if (!strncmp(line, "have ", 5)) {
 			if (got_sha1(line+5, sha1) &&
-					(multi_ack || nr_has == 1))
+					(multi_ack || nr_has == 1)) {
+				if (nr_has >= MAX_HAS)
+					multi_ack = 0;
 				packet_write(1, "ACK %s%s\n",
 					sha1_to_hex(sha1),
-					multi_ack && nr_has < MAX_HAS ?
-					" continue" : "");
+					multi_ack ?  " continue" : "");
+				if (multi_ack)
+					memcpy(last_sha1, sha1, 20);
+			}
 			continue;
 		}
 		if (!strcmp(line, "done")) {
-			if (nr_has > 0)
+			if (nr_has > 0) {
+				if (multi_ack)
+					packet_write(1, "ACK %s\n",
+							sha1_to_hex(last_sha1));
 				return 0;
+			}
 			packet_write(1, "NAK\n");
 			return -1;
 		}
@@ -155,6 +169,7 @@ static int receive_needs(void)
 
 	needs = 0;
 	for (;;) {
+		struct object *o;
 		unsigned char dummy[20], *sha1_buf;
 		len = packet_read_line(0, line, sizeof(line));
 		reset_timeout();
@@ -174,19 +189,38 @@ static int receive_needs(void)
 		if (strncmp("want ", line, 5) || get_sha1_hex(line+5, sha1_buf))
 			die("git-upload-pack: protocol error, "
 			    "expected to get sha, not '%s'", line);
-
 		if (strstr(line+45, "multi_ack"))
 			multi_ack = 1;
 
-		needs++;
+		/* We have sent all our refs already, and the other end
+		 * should have chosen out of them; otherwise they are
+		 * asking for nonsense.
+		 *
+		 * Hmph.  We may later want to allow "want" line that
+		 * asks for something like "master~10" (symbolic)...
+		 * would it make sense?  I don't know.
+		 */
+		o = lookup_object(sha1_buf);
+		if (!o || !(o->flags & OUR_REF))
+			die("git-upload-pack: not our ref %s", line+5);
+		if (!(o->flags & WANTED)) {
+			o->flags |= WANTED;
+			needs++;
+		}
 	}
 }
 
 static int send_ref(const char *refname, const unsigned char *sha1)
 {
+	static char *capabilities = "\0multi_ack";
 	struct object *o = parse_object(sha1);
 
-	packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
+	packet_write(1, "%s %s%s\n", sha1_to_hex(sha1), refname, capabilities);
+	capabilities = "";
+	if (!(o->flags & OUR_REF)) {
+		o->flags |= OUR_REF;
+		nr_our_refs++;
+	}
 	if (o->type == tag_type) {
 		o = deref_tag(o);
 		packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);