summaryrefslogtreecommitdiff
path: root/connect.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-25 21:55:24 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-25 21:55:24 (GMT)
commitaf2d3aa4d84fd3475d9b676f669eab3c4227189f (patch)
tree2ada0cb8fce070b6b2c56fa689791230636f1857 /connect.c
parent7efc8e43508b415e2540dbcb79521bde16c51e0c (diff)
downloadgit-af2d3aa4d84fd3475d9b676f669eab3c4227189f.zip
git-af2d3aa4d84fd3475d9b676f669eab3c4227189f.tar.gz
git-af2d3aa4d84fd3475d9b676f669eab3c4227189f.tar.bz2
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>
Diffstat (limited to 'connect.c')
-rw-r--r--connect.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/connect.c b/connect.c
index 57e25a3..b171c5d 100644
--- a/connect.c
+++ b/connect.c
@@ -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);
}