mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert two "no-done" reverts

Browse Source 
Last night I had to make these two emergency reverts, but now we have a
better understanding of which part of the topic was broken, let's get rid
of the revert to fix it correctly.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2011-03-29 12:29:10 -07:00
parent 07514c83c2
commit 4e10cf9a17
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/fetch-pack.c
View File

@ -15,6 +15,7 @@ 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",
};
@ -250,6 +251,7 @@ 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;
@ -288,6 +290,7 @@ 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");
@ -406,8 +409,10 @@ 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;
}
}
@ -421,8 +426,10 @@ static int find_common(int fd[2], unsigned char *result_sha1,
}
}
done:
packet_buf_write(&req_buf, "done\n");
send_request(fd[1], &req_buf);
if (!got_ready || !no_done) {
packet_buf_write(&req_buf, "done\n");
send_request(fd[1], &req_buf);
}
if (args.verbose)
fprintf(stderr, "done\n");
if (retval != 0) {
@ -725,6 +732,11 @@ 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)