Skip to content

Commit 07514c8

Browse files
committed
Revert "fetch-pack: Implement no-done capability"
This reverts commit 761ecf0.
1 parent 4793b7e commit 07514c8

File tree

1 file changed

+3
-15
lines changed

1 file changed

+3
-15
lines changed

builtin/fetch-pack.c

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ static int transfer_unpack_limit = -1;
1515
static int fetch_unpack_limit = -1;
1616
static int unpack_limit = 100;
1717
static int prefer_ofs_delta = 1;
18-
static int no_done = 0;
1918
static struct fetch_pack_args args = {
2019
/* .uploadpack = */ "git-upload-pack",
2120
};
@@ -251,7 +250,6 @@ static int find_common(int fd[2], unsigned char *result_sha1,
251250
const unsigned char *sha1;
252251
unsigned in_vain = 0;
253252
int got_continue = 0;
254-
int got_ready = 0;
255253
struct strbuf req_buf = STRBUF_INIT;
256254
size_t state_len = 0;
257255

@@ -290,7 +288,6 @@ static int find_common(int fd[2], unsigned char *result_sha1,
290288
struct strbuf c = STRBUF_INIT;
291289
if (multi_ack == 2) strbuf_addstr(&c, " multi_ack_detailed");
292290
if (multi_ack == 1) strbuf_addstr(&c, " multi_ack");
293-
if (no_done) strbuf_addstr(&c, " no-done");
294291
if (use_sideband == 2) strbuf_addstr(&c, " side-band-64k");
295292
if (use_sideband == 1) strbuf_addstr(&c, " side-band");
296293
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,
409406
retval = 0;
410407
in_vain = 0;
411408
got_continue = 1;
412-
if (ack == ACK_ready) {
409+
if (ack == ACK_ready)
413410
rev_list = NULL;
414-
got_ready = 1;
415-
}
416411
break;
417412
}
418413
}
@@ -426,10 +421,8 @@ static int find_common(int fd[2], unsigned char *result_sha1,
426421
}
427422
}
428423
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);
433426
if (args.verbose)
434427
fprintf(stderr, "done\n");
435428
if (retval != 0) {
@@ -732,11 +725,6 @@ static struct ref *do_fetch_pack(int fd[2],
732725
if (args.verbose)
733726
fprintf(stderr, "Server supports multi_ack_detailed\n");
734727
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-
}
740728
}
741729
else if (server_supports("multi_ack")) {
742730
if (args.verbose)

0 commit comments

Comments
 (0)