Commit be98c9e9e9b0eea2a70c2e81f08e400ecd4d9c27
2018-06-26T02:32:50
Remove GIT_PKT_PACK entirely (cherry picked from commit 90cf86070046fcffd5306915b57786da054d8964)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
diff --git a/src/transports/smart.h b/src/transports/smart.h
index e33a254..9cffb9e 100644
--- a/src/transports/smart.h
+++ b/src/transports/smart.h
@@ -40,7 +40,7 @@ enum git_pkt_type {
GIT_PKT_HAVE,
GIT_PKT_ACK,
GIT_PKT_NAK,
- GIT_PKT_PACK,
+ GIT_PKT_PACK__UNUSED,
GIT_PKT_COMMENT,
GIT_PKT_ERR,
GIT_PKT_DATA,
diff --git a/src/transports/smart_pkt.c b/src/transports/smart_pkt.c
index d66ee3e..2377244 100644
--- a/src/transports/smart_pkt.c
+++ b/src/transports/smart_pkt.c
@@ -86,19 +86,6 @@ static int nak_pkt(git_pkt **out)
return 0;
}
-static int pack_pkt(git_pkt **out)
-{
- git_pkt *pkt;
-
- pkt = git__malloc(sizeof(git_pkt));
- GITERR_CHECK_ALLOC(pkt);
-
- pkt->type = GIT_PKT_PACK;
- *out = pkt;
-
- return 0;
-}
-
static int comment_pkt(git_pkt **out, const char *line, size_t len)
{
git_pkt_comment *pkt;
@@ -378,7 +365,7 @@ static int32_t parse_len(const char *line)
num[k] = '.';
}
}
-
+
giterr_set(GITERR_NET, "invalid hex digit in length: '%s'", num);
return -1;
}
@@ -415,17 +402,7 @@ int git_pkt_parse_line(
len = parse_len(line);
if (len < 0) {
- /*
- * If we fail to parse the length, it might be because the
- * server is trying to send us the packfile already.
- */
- if (bufflen >= 4 && !git__prefixcmp(line, "PACK")) {
- giterr_clear();
- *out = line;
- return pack_pkt(head);
- }
-
- return (int)len;
+ return GIT_ERROR;
}
/*