From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Mar 2011 06:35:39 +0000 (-0700)
Subject: Revert "fetch-pack: Implement no-done capability"
X-Git-Tag: v1.7.5-rc0~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=07514c83c2b7e6de926ef758905e3f43b4de6bfa;p=git.git

Revert "fetch-pack: Implement no-done capability"

This reverts commit 761ecf0bc7b6cddf311f00877c59e6381cdbdeea.
---

diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index bf9990ce1..1724b7605 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -15,7 +15,6 @@ static int transfer_unpack_limit = -1;
 static int fetch_unpack_limit = -1;
 static int unpack_limit = 100;
 static int prefer_ofs_delta = 1;
-static int no_done = 0;
 static struct fetch_pack_args args = {
 	/* .uploadpack = */ "git-upload-pack",
 };
@@ -251,7 +250,6 @@ static int find_common(int fd[2], unsigned char *result_sha1,
 	const unsigned char *sha1;
 	unsigned in_vain = 0;
 	int got_continue = 0;
-	int got_ready = 0;
 	struct strbuf req_buf = STRBUF_INIT;
 	size_t state_len = 0;
 
@@ -290,7 +288,6 @@ static int find_common(int fd[2], unsigned char *result_sha1,
 			struct strbuf c = STRBUF_INIT;
 			if (multi_ack == 2)     strbuf_addstr(&c, " multi_ack_detailed");
 			if (multi_ack == 1)     strbuf_addstr(&c, " multi_ack");
-			if (no_done)            strbuf_addstr(&c, " no-done");
 			if (use_sideband == 2)  strbuf_addstr(&c, " side-band-64k");
 			if (use_sideband == 1)  strbuf_addstr(&c, " side-band");
 			if (args.use_thin_pack) strbuf_addstr(&c, " thin-pack");
@@ -409,10 +406,8 @@ static int find_common(int fd[2], unsigned char *result_sha1,
 					retval = 0;
 					in_vain = 0;
 					got_continue = 1;
-					if (ack == ACK_ready) {
+					if (ack == ACK_ready)
 						rev_list = NULL;
-						got_ready = 1;
-					}
 					break;
 					}
 				}
@@ -426,10 +421,8 @@ static int find_common(int fd[2], unsigned char *result_sha1,
 		}
 	}
 done:
-	if (!got_ready || !no_done) {
-		packet_buf_write(&req_buf, "done\n");
-		send_request(fd[1], &req_buf);
-	}
+	packet_buf_write(&req_buf, "done\n");
+	send_request(fd[1], &req_buf);
 	if (args.verbose)
 		fprintf(stderr, "done\n");
 	if (retval != 0) {
@@ -732,11 +725,6 @@ static struct ref *do_fetch_pack(int fd[2],
 		if (args.verbose)
 			fprintf(stderr, "Server supports multi_ack_detailed\n");
 		multi_ack = 2;
-		if (server_supports("no-done")) {
-			if (args.verbose)
-				fprintf(stderr, "Server supports no-done\n");
-			no_done = 1;
-		}
 	}
 	else if (server_supports("multi_ack")) {
 		if (args.verbose)