Revert recent fetch-pack/upload-pack updates.

Let's have it simmer a bit longer in the proposed updates branch
and shake the problems out.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2005-10-25 14:55:24 -07:00
parent 7efc8e4350
commit af2d3aa4d8
3 changed files with 72 additions and 196 deletions

View File

@ -59,11 +59,8 @@ int get_ack(int fd, unsigned char *result_sha1)
if (!strcmp(line, "NAK"))
return 0;
if (!strncmp(line, "ACK ", 3)) {
if (!get_sha1_hex(line+4, result_sha1)) {
if (strstr(line+45, "continue"))
return 2;
if (!get_sha1_hex(line+4, result_sha1))
return 1;
}
}
die("git-fetch_pack: expected ACK/NAK, got '%s'", line);
}