diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-29 06:33:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-29 06:33:51 (GMT) |
| commit | 4793b7e86d007c492a76a5fae379ded97008e7fb (patch) | |
| tree | e686f9429ece4e9eac23f46e5b3d020441858fcd | |
| parent | 61e8aaf6215a2983610a770645e6d0a24bafb454 (diff) | |
| download | git-4793b7e86d007c492a76a5fae379ded97008e7fb.zip git-4793b7e86d007c492a76a5fae379ded97008e7fb.tar.gz git-4793b7e86d007c492a76a5fae379ded97008e7fb.tar.bz2 | |
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.
| -rw-r--r-- | upload-pack.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/upload-pack.c b/upload-pack.c index 72aa661..eb80dd9 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -27,7 +27,6 @@ static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=< 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; @@ -432,7 +431,6 @@ static int get_common_commits(void) char last_hex[41]; int got_common = 0; int got_other = 0; - int sent_ready = 0; save_commit_buffer = 0; @@ -442,17 +440,10 @@ static int get_common_commits(void) 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; @@ -466,10 +457,9 @@ static int get_common_commits(void) 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; @@ -545,8 +535,6 @@ static void receive_needs(void) 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")) @@ -640,7 +628,7 @@ static int send_ref(const char *refname, const unsigned char *sha1, int flag, vo { 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) |