X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=upload-pack.c;h=21b4b8b7575dd3ceb2fdf40b5aa4b7483168ec1e;hb=7a3dd472ad2c69b7450a59eb2a35efb0698993d0;hp=6d844cc3199ae5bda475ec57bef4efb4901176bb;hpb=319aae27567f3ddc40e9083c425f7eaf567006a0;p=git.git

diff --git a/upload-pack.c b/upload-pack.c
index 6d844cc3..21b4b8b7 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -1,6 +1,8 @@
 #include "cache.h"
 #include "refs.h"
 #include "pkt-line.h"
+#include "tag.h"
+#include "object.h"
 
 static const char upload_pack_usage[] = "git-upload-pack <dir>";
 
@@ -30,10 +32,18 @@ static void create_pack_file(void)
 
 	if (!pid) {
 		int i;
-		int args = nr_has + nr_needs + 5;
-		char **argv = xmalloc(args * sizeof(char *));
-		char *buf = xmalloc(args * 45);
-		char **p = argv;
+		int args;
+		char **argv;
+		char *buf;
+		char **p;
+
+		if (MAX_NEEDS <= nr_needs)
+			args = nr_has + 10;
+		else
+			args = nr_has + nr_needs + 5;
+		argv = xmalloc(args * sizeof(char *));
+		buf = xmalloc(args * 45);
+		p = argv;
 
 		dup2(fd[1], 1);
 		close(0);
@@ -41,10 +51,14 @@ static void create_pack_file(void)
 		close(fd[1]);
 		*p++ = "git-rev-list";
 		*p++ = "--objects";
-		for (i = 0; i < nr_needs; i++) {
-			*p++ = buf;
-			memcpy(buf, sha1_to_hex(needs_sha1[i]), 41);
-			buf += 41;
+		if (MAX_NEEDS <= nr_needs)
+			*p++ = "--all";
+		else {
+			for (i = 0; i < nr_needs; i++) {
+				*p++ = buf;
+				memcpy(buf, sha1_to_hex(needs_sha1[i]), 41);
+				buf += 41;
+			}
 		}
 		for (i = 0; i < nr_has; i++) {
 			*p++ = buf;
@@ -129,25 +143,37 @@ static int receive_needs(void)
 
 	needs = 0;
 	for (;;) {
+		unsigned char dummy[20], *sha1_buf;
 		len = packet_read_line(0, line, sizeof(line));
 		if (!len)
 			return needs;
 
-		/*
-		 * This is purely theoretical right now: git-fetch-pack only
-		 * ever asks for a single HEAD
-		 */
-		if (needs >= MAX_NEEDS)
-			die("I'm only doing a max of %d requests", MAX_NEEDS);
-		if (strncmp("want ", line, 5) || get_sha1_hex(line+5, needs_sha1[needs]))
-			die("git-upload-pack: protocol error, expected to get sha, not '%s'", line);
+		sha1_buf = dummy;
+		if (needs == MAX_NEEDS) {
+			fprintf(stderr,
+				"warning: supporting only a max of %d requests. "
+				"sending everything instead.\n",
+				MAX_NEEDS);
+		}
+		else if (needs < MAX_NEEDS)
+			sha1_buf = needs_sha1[needs];
+
+		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);
 		needs++;
 	}
 }
 
 static int send_ref(const char *refname, const unsigned char *sha1)
 {
+	struct object *o = parse_object(sha1);
+
 	packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
+	if (o->type == tag_type) {
+		o = deref_tag(o);
+		packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);
+	}
 	return 0;
 }
 
@@ -170,12 +196,16 @@ int main(int argc, char **argv)
 	if (argc != 2)
 		usage(upload_pack_usage);
 	dir = argv[1];
-	if (chdir(dir))
-		die("git-upload-pack unable to chdir to %s", dir);
+
+	/* chdir to the directory. If that fails, try appending ".git" */
+	if (chdir(dir) < 0) {
+		if (chdir(mkpath("%s.git", dir)) < 0)
+			die("git-upload-pack unable to chdir to %s", dir);
+	}
 	chdir(".git");
 	if (access("objects", X_OK) || access("refs", X_OK))
 		die("git-upload-pack: %s doesn't seem to be a git archive", dir);
-	setenv("GIT_DIR", ".", 1);
+	putenv("GIT_DIR=.");
 	upload_pack();
 	return 0;
 }