summaryrefslogtreecommitdiff
path: root/connect.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2009-10-31 00:47:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-10-31 02:20:53 (GMT)
commit28754ab5f0ce9b4f6ca1641c3e10e2c68bd9b3fc (patch)
tree4f70d7d3eb176452be9345b915fbc3db60edbabc /connect.c
parentedace6f02eeae6f4a06ed1e4f6308703523d8535 (diff)
downloadgit-28754ab5f0ce9b4f6ca1641c3e10e2c68bd9b3fc.zip
git-28754ab5f0ce9b4f6ca1641c3e10e2c68bd9b3fc.tar.gz
git-28754ab5f0ce9b4f6ca1641c3e10e2c68bd9b3fc.tar.bz2
Move "get_ack()" back to fetch-pack
In 41cb7488 Linus moved this function to connect.c for reuse inside of the git-clone-pack command. That was 2005, but in 2006 Junio retired git-clone-pack in commit efc7fa53. Since then the only caller has been fetch-pack. Since this ACK/NAK exchange is only used by the fetch-pack/upload-pack protocol we should move it back to be a private detail of fetch-pack. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'connect.c')
-rw-r--r--connect.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/connect.c b/connect.c
index 7945e38..839a103 100644
--- a/connect.c
+++ b/connect.c
@@ -107,27 +107,6 @@ int server_supports(const char *feature)
strstr(server_capabilities, feature) != NULL;
}
-int get_ack(int fd, unsigned char *result_sha1)
-{
- static char line[1000];
- int len = packet_read_line(fd, line, sizeof(line));
-
- if (!len)
- die("git fetch-pack: expected ACK/NAK, got EOF");
- if (line[len-1] == '\n')
- line[--len] = 0;
- if (!strcmp(line, "NAK"))
- return 0;
- if (!prefixcmp(line, "ACK ")) {
- 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);
-}
-
int path_match(const char *path, int nr, char **match)
{
int i;