summaryrefslogtreecommitdiff
path: root/connect.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2005-10-28 04:50:26 +0200
committerJunio C Hamano <junkio@cox.net>2005-10-28 22:57:01 -0700
commitc4c86f07d01bc4a05126b129f644e70dd9e244d0 (patch)
tree54b79ae088630bfa7f519b63405c86bc32511d3e /connect.c
parent1bd8c8f00b1c7facb67c99047fe777b53f2c49ff (diff)
downloadgit-c4c86f07d01bc4a05126b129f644e70dd9e244d0.tar.gz
git-fetch-pack: Support multi_ack extension
The client side support for multi_ack. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'connect.c')
-rw-r--r--connect.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/connect.c b/connect.c
index 5cc49f975a..b8aea351b8 100644
--- a/connect.c
+++ b/connect.c
@@ -73,8 +73,11 @@ 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 (!get_sha1_hex(line+4, result_sha1)) {
+ if (strstr(line+45, "continue"))
+ return 2;
return 1;
+ }
}
die("git-fetch_pack: expected ACK/NAK, got '%s'", line);
}