X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fetch-pack.c;h=65e007639ac744c3f354f71c157a85c5d6477d49;hb=62b532b080d56e02d8f486e801110456ab0bb380;hp=3475ea380a29495269ac64fa9e4ff797b9b8687c;hpb=85c414b5e05d2087e779cdd3587d6ad4cae56e72;p=git.git

diff --git a/fetch-pack.c b/fetch-pack.c
index 3475ea38..65e00763 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -3,7 +3,8 @@
 #include "pkt-line.h"
 #include <sys/wait.h>
 
-static const char fetch_pack_usage[] = "git-fetch-pack [host:]directory [heads]* < mycommitlist";
+static int quiet;
+static const char fetch_pack_usage[] = "git-fetch-pack [-q] [--exec=upload-pack] [host:]directory [heads]* < mycommitlist";
 static const char *exec = "git-upload-pack";
 
 static int find_common(int fd[2], unsigned char *result_sha1, unsigned char *remote)
@@ -52,44 +53,28 @@ static int find_common(int fd[2], unsigned char *result_sha1, unsigned char *rem
 	return retval;
 }
 
-static int get_remote_heads(int fd, int nr_match, char **match, unsigned char *result)
-{
-	int count = 0;
-
-	for (;;) {
-		static char line[1000];
-		unsigned char sha1[20];
-		char *refname;
-		int len;
-
-		len = packet_read_line(fd, line, sizeof(line));
-		if (!len)
-			break;
-		if (line[len-1] == '\n')
-			line[--len] = 0;
-		if (len < 42 || get_sha1_hex(line, sha1))
-			die("git-fetch-pack: protocol error - expected ref descriptor, got '%s¤'", line);
-		refname = line+41;
-		if (nr_match && !path_match(refname, nr_match, match))
-			continue;
-		count++;
-		memcpy(result, sha1, 20);
-	}
-	return count;
-}
-
+/*
+ * Eventually we'll want to be able to fetch multiple heads.
+ *
+ * Right now we'll just require a single match.
+ */
 static int fetch_pack(int fd[2], int nr_match, char **match)
 {
-	unsigned char sha1[20], remote[20];
-	int heads, status;
+	struct ref *ref;
+	unsigned char sha1[20];
+	int status;
 	pid_t pid;
 
-	heads = get_remote_heads(fd[0], nr_match, match, remote);
-	if (heads != 1) {
+	get_remote_heads(fd[0], &ref, nr_match, match);
+	if (!ref) {
+		packet_flush(fd[1]);
+		die("no matching remote head");
+	}
+	if (ref->next) {
 		packet_flush(fd[1]);
-		die(heads ? "multiple remote heads" : "no matching remote head");
+		die("multiple remote heads");
 	}
-	if (find_common(fd, sha1, remote) < 0)
+	if (find_common(fd, sha1, ref->old_sha1) < 0)
 		die("git-fetch-pack: no common commits");
 	pid = fork();
 	if (pid < 0)
@@ -98,7 +83,8 @@ static int fetch_pack(int fd[2], int nr_match, char **match)
 		dup2(fd[0], 0);
 		close(fd[0]);
 		close(fd[1]);
-		execlp("git-unpack-objects", "git-unpack-objects", NULL);
+		execlp("git-unpack-objects", "git-unpack-objects",
+		       quiet ? "-q" : NULL, NULL);
 		die("git-unpack-objects exec failed");
 	}
 	close(fd[0]);
@@ -111,7 +97,7 @@ static int fetch_pack(int fd[2], int nr_match, char **match)
 		int code = WEXITSTATUS(status);
 		if (code)
 			die("git-unpack-objects died with error code %d", code);
-		puts(sha1_to_hex(remote));
+		puts(sha1_to_hex(ref->old_sha1));
 		return 0;
 	}
 	if (WIFSIGNALED(status)) {
@@ -134,7 +120,10 @@ int main(int argc, char **argv)
 		char *arg = argv[i];
 
 		if (*arg == '-') {
-			/* Arguments go here */
+			if (!strncmp("--exec=", arg, 7)) {
+				exec = arg + 7;
+				continue;
+			}
 			usage(fetch_pack_usage);
 		}
 		dest = arg;