Revert "fetch-pack: Implement no-done capability"
This reverts commit 761ecf0bc7b6cddf311f00877c59e6381cdbdeea.
Junio C Hamano committed
Mar 28, 2011 at 23:35 UTC
07514c83c2b7e6de926ef758905e3f43b4de6bfa
1 file changed
+3
-15
builtin/fetch-pack.c
+3
-15
@@ -15,7 +15,6 @@ static int transfer_unpack_limit = -1;
15
static int fetch_unpack_limit = -1;
16
static int unpack_limit = 100;
17
static int prefer_ofs_delta = 1;
18
-static int no_done = 0;
18
static struct fetch_pack_args args = {
19
/* .uploadpack = */ "git-upload-pack",
20
};
@@ -251,7 +250,6 @@ static int find_common(int fd[2], unsigned char *result_sha1,
250
const unsigned char *sha1;
251
unsigned in_vain = 0;
252
int got_continue = 0;
254
- int got_ready = 0;
253
struct strbuf req_buf = STRBUF_INIT;
254
size_t state_len = 0;
255
@@ -290,7 +288,6 @@ static int find_common(int fd[2], unsigned char *result_sha1,
288
struct strbuf c = STRBUF_INIT;
289
if (multi_ack == 2) strbuf_addstr(&c, " multi_ack_detailed");
290
if (multi_ack == 1) strbuf_addstr(&c, " multi_ack");
293
- if (no_done) strbuf_addstr(&c, " no-done");
291
if (use_sideband == 2) strbuf_addstr(&c, " side-band-64k");
292
if (use_sideband == 1) strbuf_addstr(&c, " side-band");
293
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,
406
retval = 0;
407
in_vain = 0;
408
got_continue = 1;
412
- if (ack == ACK_ready) {
409
+ if (ack == ACK_ready)
410
rev_list = NULL;
414
- got_ready = 1;
415
- }
411
break;
412
}
413
}
@@ -426,10 +421,8 @@ static int find_common(int fd[2], unsigned char *result_sha1,
421
}
422
}
423
done:
429
- if (!got_ready || !no_done) {
430
- packet_buf_write(&req_buf, "done\n");
431
- send_request(fd[1], &req_buf);
432
- }
424
+ packet_buf_write(&req_buf, "done\n");
425
+ send_request(fd[1], &req_buf);
426
if (args.verbose)
427
fprintf(stderr, "done\n");
428
if (retval != 0) {
@@ -732,11 +725,6 @@ static struct ref *do_fetch_pack(int fd[2],
725
if (args.verbose)
726
fprintf(stderr, "Server supports multi_ack_detailed\n");
727
multi_ack = 2;
735
- if (server_supports("no-done")) {
736
- if (args.verbose)
737
- fprintf(stderr, "Server supports no-done\n");
738
- no_done = 1;
739
- }
728
}
729
else if (server_supports("multi_ack")) {
730
if (args.verbose)