зеркало из https://github.com/microsoft/git.git
Revert "upload-pack: Implement no-done capability"
This reverts3e63b21
(upload-pack: Implement no-done capability, 2011-03-14). Together with761ecf0
(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.
This commit is contained in:
Родитель
61e8aaf621
Коммит
4793b7e86d
|
@ -27,7 +27,6 @@ static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<
|
||||||
static unsigned long oldest_have;
|
static unsigned long oldest_have;
|
||||||
|
|
||||||
static int multi_ack, nr_our_refs;
|
static int multi_ack, nr_our_refs;
|
||||||
static int no_done;
|
|
||||||
static int use_thin_pack, use_ofs_delta, use_include_tag;
|
static int use_thin_pack, use_ofs_delta, use_include_tag;
|
||||||
static int no_progress, daemon_mode;
|
static int no_progress, daemon_mode;
|
||||||
static int shallow_nr;
|
static int shallow_nr;
|
||||||
|
@ -432,7 +431,6 @@ static int get_common_commits(void)
|
||||||
char last_hex[41];
|
char last_hex[41];
|
||||||
int got_common = 0;
|
int got_common = 0;
|
||||||
int got_other = 0;
|
int got_other = 0;
|
||||||
int sent_ready = 0;
|
|
||||||
|
|
||||||
save_commit_buffer = 0;
|
save_commit_buffer = 0;
|
||||||
|
|
||||||
|
@ -442,17 +440,10 @@ static int get_common_commits(void)
|
||||||
|
|
||||||
if (!len) {
|
if (!len) {
|
||||||
if (multi_ack == 2 && got_common
|
if (multi_ack == 2 && got_common
|
||||||
&& !got_other && ok_to_give_up()) {
|
&& !got_other && ok_to_give_up())
|
||||||
sent_ready = 1;
|
|
||||||
packet_write(1, "ACK %s ready\n", last_hex);
|
packet_write(1, "ACK %s ready\n", last_hex);
|
||||||
}
|
|
||||||
if (have_obj.nr == 0 || multi_ack)
|
if (have_obj.nr == 0 || multi_ack)
|
||||||
packet_write(1, "NAK\n");
|
packet_write(1, "NAK\n");
|
||||||
|
|
||||||
if (no_done && sent_ready) {
|
|
||||||
packet_write(1, "ACK %s\n", last_hex);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if (stateless_rpc)
|
if (stateless_rpc)
|
||||||
exit(0);
|
exit(0);
|
||||||
got_common = 0;
|
got_common = 0;
|
||||||
|
@ -466,10 +457,9 @@ static int get_common_commits(void)
|
||||||
got_other = 1;
|
got_other = 1;
|
||||||
if (multi_ack && ok_to_give_up()) {
|
if (multi_ack && ok_to_give_up()) {
|
||||||
const char *hex = sha1_to_hex(sha1);
|
const char *hex = sha1_to_hex(sha1);
|
||||||
if (multi_ack == 2) {
|
if (multi_ack == 2)
|
||||||
sent_ready = 1;
|
|
||||||
packet_write(1, "ACK %s ready\n", hex);
|
packet_write(1, "ACK %s ready\n", hex);
|
||||||
} else
|
else
|
||||||
packet_write(1, "ACK %s continue\n", hex);
|
packet_write(1, "ACK %s continue\n", hex);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -545,8 +535,6 @@ static void receive_needs(void)
|
||||||
multi_ack = 2;
|
multi_ack = 2;
|
||||||
else if (strstr(line+45, "multi_ack"))
|
else if (strstr(line+45, "multi_ack"))
|
||||||
multi_ack = 1;
|
multi_ack = 1;
|
||||||
if (strstr(line+45, "no-done"))
|
|
||||||
no_done = 1;
|
|
||||||
if (strstr(line+45, "thin-pack"))
|
if (strstr(line+45, "thin-pack"))
|
||||||
use_thin_pack = 1;
|
use_thin_pack = 1;
|
||||||
if (strstr(line+45, "ofs-delta"))
|
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"
|
static const char *capabilities = "multi_ack thin-pack side-band"
|
||||||
" side-band-64k ofs-delta shallow no-progress"
|
" 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);
|
struct object *o = parse_object(sha1);
|
||||||
|
|
||||||
if (!o)
|
if (!o)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче