1. Stefan Saasen
  2. git

Commits

Junio C Hamano  committed 4793b7e

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

This reverts 3e63b21 (upload-pack: Implement no-done capability,
2011-03-14). Together with 761ecf0 (fetch-pack: Implement no-done
capability, 2011-03-14) it seems to make the fetch-pack process out of
sync and makes it keep talking long after upload-pack stopped listening to
it, terminating the process with SIGPIPE.

  • Participants
  • Parent commits 61e8aaf
  • Branches master

Comments (0)

Files changed (1)

File upload-pack.c

View file
 static unsigned long oldest_have;
 
 static int multi_ack, nr_our_refs;
-static int no_done;
 static int use_thin_pack, use_ofs_delta, use_include_tag;
 static int no_progress, daemon_mode;
 static int shallow_nr;
 	char last_hex[41];
 	int got_common = 0;
 	int got_other = 0;
-	int sent_ready = 0;
 
 	save_commit_buffer = 0;
 
 
 		if (!len) {
 			if (multi_ack == 2 && got_common
-			    && !got_other && ok_to_give_up()) {
-				sent_ready = 1;
+			    && !got_other && ok_to_give_up())
 				packet_write(1, "ACK %s ready\n", last_hex);
-			}
 			if (have_obj.nr == 0 || multi_ack)
 				packet_write(1, "NAK\n");
-
-			if (no_done && sent_ready) {
-				packet_write(1, "ACK %s\n", last_hex);
-				return 0;
-			}
 			if (stateless_rpc)
 				exit(0);
 			got_common = 0;
 				got_other = 1;
 				if (multi_ack && ok_to_give_up()) {
 					const char *hex = sha1_to_hex(sha1);
-					if (multi_ack == 2) {
-						sent_ready = 1;
+					if (multi_ack == 2)
 						packet_write(1, "ACK %s ready\n", hex);
-					} else
+					else
 						packet_write(1, "ACK %s continue\n", hex);
 				}
 				break;
 			multi_ack = 2;
 		else if (strstr(line+45, "multi_ack"))
 			multi_ack = 1;
-		if (strstr(line+45, "no-done"))
-			no_done = 1;
 		if (strstr(line+45, "thin-pack"))
 			use_thin_pack = 1;
 		if (strstr(line+45, "ofs-delta"))
 {
 	static const char *capabilities = "multi_ack thin-pack side-band"
 		" side-band-64k ofs-delta shallow no-progress"
-		" include-tag multi_ack_detailed no-done";
+		" include-tag multi_ack_detailed";
 	struct object *o = parse_object(sha1);
 
 	if (!o)