rugged 0.26.7 → 0.27.0

data/vendor/libgit2/src/transaction.c

@@ -5,7 +5,8 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "common.h"
+#include "transaction.h"
+
 #include "repository.h"
 #include "strmap.h"
 #include "refdb.h"

data/vendor/libgit2/src/transport.c

@@ -4,7 +4,9 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
+
 #include "common.h"
+
 #include "git2/types.h"
 #include "git2/remote.h"
 #include "git2/net.h"

data/vendor/libgit2/src/transports/auth.c

@@ -5,9 +5,10 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
+#include "auth.h"
+
 #include "git2.h"
 #include "buffer.h"
-#include "auth.h"
 
 static int basic_next_token(
 	git_buf *out, git_http_auth_context *ctx, git_cred *c)

data/vendor/libgit2/src/transports/auth.h

@@ -5,8 +5,10 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#ifndef INCLUDE_http_auth_h__
-#define INCLUDE_http_auth_h__
+#ifndef INCLUDE_transports_auth_h__
+#define INCLUDE_transports_auth_h__
+
+#include "common.h"
 
 #include "git2.h"
 #include "netops.h"
@@ -60,4 +62,3 @@ int git_http_auth_basic(
 	const gitno_connection_data *connection_data);
 
 #endif
-

data/vendor/libgit2/src/transports/auth_negotiate.c

@@ -5,10 +5,11 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
+#include "auth_negotiate.h"
+
 #ifdef GIT_GSSAPI
 
 #include "git2.h"
-#include "common.h"
 #include "buffer.h"
 #include "auth.h"
 

data/vendor/libgit2/src/transports/auth_negotiate.h

@@ -5,9 +5,10 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#ifndef INCLUDE_auth_negotiate_h__
-#define INCLUDE_auth_negotiate_h__
+#ifndef INCLUDE_transports_auth_negotiate_h__
+#define INCLUDE_transports_auth_negotiate_h__
 
+#include "common.h"
 #include "git2.h"
 #include "auth.h"
 
@@ -24,4 +25,3 @@ extern int git_http_auth_negotiate(
 #endif /* GIT_GSSAPI */
 
 #endif
-

data/vendor/libgit2/src/transports/cred.c

@@ -5,6 +5,8 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
+#include "cred.h"
+
 #include "git2.h"
 #include "smart.h"
 #include "git2/cred_helpers.h"

data/vendor/libgit2/src/transports/cred.h

@@ -4,8 +4,10 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
-#ifndef INCLUDE_git_cred_h__
-#define INCLUDE_git_cred_h__
+#ifndef INCLUDE_transports_cred_h__
+#define INCLUDE_transports_cred_h__
+
+#include "common.h"
 
 #include "git2/transport.h"
 

data/vendor/libgit2/src/transports/cred_helpers.c

@@ -6,6 +6,7 @@
  */
 
 #include "common.h"
+
 #include "git2/cred_helpers.h"
 
 int git_cred_userpass(

data/vendor/libgit2/src/transports/git.c

@@ -5,12 +5,14 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
+#include "common.h"
+
 #include "git2.h"
 #include "buffer.h"
 #include "netops.h"
 #include "git2/sys/transport.h"
 #include "stream.h"
-#include "socket_stream.h"
+#include "streams/socket.h"
 
 #define OWNING_SUBTRANSPORT(s) ((git_subtransport *)(s)->parent.subtransport)
 

data/vendor/libgit2/src/transports/http.c

@@ -4,6 +4,9 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
+
+#include "common.h"
+
 #ifndef GIT_WINHTTP
 
 #include "git2.h"
@@ -14,10 +17,11 @@
 #include "remote.h"
 #include "smart.h"
 #include "auth.h"
+#include "http.h"
 #include "auth_negotiate.h"
-#include "tls_stream.h"
-#include "socket_stream.h"
-#include "curl_stream.h"
+#include "streams/tls.h"
+#include "streams/socket.h"
+#include "streams/curl.h"
 
 git_http_auth_scheme auth_schemes[] = {
 	{ GIT_AUTHTYPE_NEGOTIATE, "Negotiate", GIT_CREDTYPE_DEFAULT, git_http_auth_negotiate },
@@ -187,16 +191,6 @@ static int apply_credentials(git_buf *buf, http_subtransport *t)
 	return context->next_token(buf, context, cred);
 }
 
-static const char *user_agent(void)
-{
-	const char *custom = git_libgit2__user_agent();
-
-	if (custom)
-		return custom;
-
-	return "libgit2 " LIBGIT2_VERSION;
-}
-
 static int gen_request(
 	git_buf *buf,
 	http_stream *s,
@@ -208,7 +202,9 @@ static int gen_request(
 
 	git_buf_printf(buf, "%s %s%s HTTP/1.1\r\n", s->verb, path, s->service_url);
 
-	git_buf_printf(buf, "User-Agent: git/2.0 (%s)\r\n", user_agent());
+	git_buf_puts(buf, "User-Agent: ");
+	git_http__user_agent(buf);
+	git_buf_puts(buf, "\r\n");
 	git_buf_printf(buf, "Host: %s\r\n", t->connection_data.host);
 
 	if (s->chunked || content_length > 0) {

data/vendor/libgit2/src/transports/http.h

@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#ifndef INCLUDE_transports_http_h__
+#define INCLUDE_transports_http_h__
+
+#include "buffer.h"
+
+GIT_INLINE(int) git_http__user_agent(git_buf *buf)
+{
+	const char *ua = git_libgit2__user_agent();
+
+	if (!ua)
+		ua = "libgit2 " LIBGIT2_VERSION;
+
+	return git_buf_printf(buf, "git/2.0 (%s)", ua);
+}
+
+#endif

data/vendor/libgit2/src/transports/local.c

@@ -4,7 +4,9 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
+
 #include "common.h"
+
 #include "git2/types.h"
 #include "git2/net.h"
 #include "git2/repository.h"
@@ -16,6 +18,7 @@
 #include "git2/pack.h"
 #include "git2/commit.h"
 #include "git2/revparse.h"
+
 #include "pack-objects.h"
 #include "refs.h"
 #include "posix.h"
@@ -504,6 +507,23 @@ static int local_counting(int stage, unsigned int current, unsigned int total, v
 	return error;
 }
 
+static int foreach_reference_cb(git_reference *reference, void *payload)
+{
+	git_revwalk *walk = (git_revwalk *)payload;
+
+	int error = git_revwalk_hide(walk, git_reference_target(reference));
+	/* The reference is in the local repository, so the target may not
+	 * exist on the remote.  It also may not be a commit. */
+	if (error == GIT_ENOTFOUND || error == GITERR_INVALID) {
+		giterr_clear();
+		error = 0;
+	}
+
+	git_reference_free(reference);
+
+	return error;
+}
+
 static int local_download_pack(
 		git_transport *transport,
 		git_repository *repo,
@@ -543,11 +563,6 @@ static int local_download_pack(
 		if (git_object_type(obj) == GIT_OBJ_COMMIT) {
 			/* Revwalker includes only wanted commits */
 			error = git_revwalk_push(walk, &rhead->oid);
-			if (!error && !git_oid_iszero(&rhead->loid)) {
-				error = git_revwalk_hide(walk, &rhead->loid);
-				if (error == GIT_ENOTFOUND)
-					error = 0;
-			}
 		} else {
 			/* Tag or some other wanted object. Add it on its own */
 			error = git_packbuilder_insert_recur(pack, &rhead->oid, rhead->name);
@@ -557,6 +572,9 @@ static int local_download_pack(
 			goto cleanup;
 	}
 
+	if ((error = git_reference_foreach(repo, foreach_reference_cb, walk)))
+		goto cleanup;
+
 	if ((error = git_packbuilder_insert_walk(pack, walk)))
 		goto cleanup;
 

data/vendor/libgit2/src/transports/smart.c

@@ -4,8 +4,10 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
-#include "git2.h"
+
 #include "smart.h"
+
+#include "git2.h"
 #include "refs.h"
 #include "refspec.h"
 #include "proxy.h"

data/vendor/libgit2/src/transports/smart.h

@@ -4,6 +4,11 @@
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
  */
+#ifndef INCLUDE_transports_smart_h__
+#define INCLUDE_transports_smart_h__
+
+#include "common.h"
+
 #include "git2.h"
 #include "vector.h"
 #include "netops.h"
@@ -28,14 +33,14 @@
 
 extern bool git_smart__ofs_delta_enabled;
 
-typedef enum {
+enum git_pkt_type {
 	GIT_PKT_CMD,
 	GIT_PKT_FLUSH,
 	GIT_PKT_REF,
 	GIT_PKT_HAVE,
 	GIT_PKT_ACK,
 	GIT_PKT_NAK,
-	GIT_PKT_PACK__UNUSED,
+	GIT_PKT_PACK,
 	GIT_PKT_COMMENT,
 	GIT_PKT_ERR,
 	GIT_PKT_DATA,
@@ -43,7 +48,7 @@ typedef enum {
 	GIT_PKT_OK,
 	GIT_PKT_NG,
 	GIT_PKT_UNPACK,
-} git_pkt_type;
+};
 
 /* Used for multi_ack and mutli_ack_detailed */
 enum git_ack_status {
@@ -55,11 +60,11 @@ enum git_ack_status {
 
 /* This would be a flush pkt */
 typedef struct {
-	git_pkt_type type;
+	enum git_pkt_type type;
 } git_pkt;
 
 struct git_pkt_cmd {
-	git_pkt_type type;
+	enum git_pkt_type type;
 	char *cmd;
 	char *path;
 	char *host;
@@ -67,50 +72,50 @@ struct git_pkt_cmd {
 
 /* This is a pkt-line with some info in it */
 typedef struct {
-	git_pkt_type type;
+	enum git_pkt_type type;
 	git_remote_head head;
 	char *capabilities;
 } git_pkt_ref;
 
 /* Useful later */
 typedef struct {
-	git_pkt_type type;
+	enum git_pkt_type type;
 	git_oid oid;
 	enum git_ack_status status;
 } git_pkt_ack;
 
 typedef struct {
-	git_pkt_type type;
+	enum git_pkt_type type;
 	char comment[GIT_FLEX_ARRAY];
 } git_pkt_comment;
 
 typedef struct {
-	git_pkt_type type;
-	size_t len;
+	enum git_pkt_type type;
+	int len;
 	char data[GIT_FLEX_ARRAY];
 } git_pkt_data;
 
 typedef git_pkt_data git_pkt_progress;
 
 typedef struct {
-	git_pkt_type type;
-	size_t len;
+	enum git_pkt_type type;
+	int len;
 	char error[GIT_FLEX_ARRAY];
 } git_pkt_err;
 
 typedef struct {
-	git_pkt_type type;
+	enum git_pkt_type type;
 	char *ref;
 } git_pkt_ok;
 
 typedef struct {
-	git_pkt_type type;
+	enum git_pkt_type type;
 	char *ref;
 	char *msg;
 } git_pkt_ng;
 
 typedef struct {
-	git_pkt_type type;
+	enum git_pkt_type type;
 	int unpack_ok;
 } git_pkt_unpack;
 
@@ -184,10 +189,12 @@ int git_smart__get_push_stream(transport_smart *t, git_smart_subtransport_stream
 int git_smart__update_heads(transport_smart *t, git_vector *symrefs);
 
 /* smart_pkt.c */
-int git_pkt_parse_line(git_pkt **head, const char **endptr, const char *line, size_t linelen);
+int git_pkt_parse_line(git_pkt **head, const char *line, const char **out, size_t len);
 int git_pkt_buffer_flush(git_buf *buf);
 int git_pkt_send_flush(GIT_SOCKET s);
 int git_pkt_buffer_done(git_buf *buf);
 int git_pkt_buffer_wants(const git_remote_head * const *refs, size_t count, transport_smart_caps *caps, git_buf *buf);
 int git_pkt_buffer_have(git_oid *oid, git_buf *buf);
 void git_pkt_free(git_pkt *pkt);
+
+#endif

data/vendor/libgit2/src/transports/smart_pkt.c

@@ -43,43 +43,34 @@ static int flush_pkt(git_pkt **out)
 static int ack_pkt(git_pkt **out, const char *line, size_t len)
 {
 	git_pkt_ack *pkt;
+	GIT_UNUSED(line);
+	GIT_UNUSED(len);
 
 	pkt = git__calloc(1, sizeof(git_pkt_ack));
 	GITERR_CHECK_ALLOC(pkt);
-	pkt->type = GIT_PKT_ACK;
-
-	if (git__prefixncmp(line, len, "ACK "))
-		goto out_err;
-	line += 4;
-	len -= 4;
 
-	if (len < GIT_OID_HEXSZ || git_oid_fromstr(&pkt->oid, line) < 0)
-		goto out_err;
-	line += GIT_OID_HEXSZ;
-	len -= GIT_OID_HEXSZ;
+	pkt->type = GIT_PKT_ACK;
+	line += 3;
+	len -= 3;
 
-	if (len && line[0] == ' ') {
-		line++;
-		len--;
+	if (len >= GIT_OID_HEXSZ) {
+		git_oid_fromstr(&pkt->oid, line + 1);
+		line += GIT_OID_HEXSZ + 1;
+		len -= GIT_OID_HEXSZ + 1;
+	}
 
-		if (!git__prefixncmp(line, len, "continue"))
+	if (len >= 7) {
+		if (!git__prefixcmp(line + 1, "continue"))
 			pkt->status = GIT_ACK_CONTINUE;
-		else if (!git__prefixncmp(line, len, "common"))
+		if (!git__prefixcmp(line + 1, "common"))
 			pkt->status = GIT_ACK_COMMON;
-		else if (!git__prefixncmp(line, len, "ready"))
+		if (!git__prefixcmp(line + 1, "ready"))
 			pkt->status = GIT_ACK_READY;
-		else
-			goto out_err;
 	}
 
 	*out = (git_pkt *) pkt;
 
 	return 0;
-
-out_err:
-	giterr_set(GITERR_NET, "error parsing ACK pkt-line");
-	git__free(pkt);
-	return -1;
 }
 
 static int nak_pkt(git_pkt **out)
@@ -95,6 +86,19 @@ 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;
@@ -116,12 +120,10 @@ static int comment_pkt(git_pkt **out, const char *line, size_t len)
 
 static int err_pkt(git_pkt **out, const char *line, size_t len)
 {
-	git_pkt_err *pkt = NULL;
+	git_pkt_err *pkt;
 	size_t alloclen;
 
 	/* Remove "ERR " from the line */
-	if (git__prefixncmp(line, len, "ERR "))
-		goto out_err;
 	line += 4;
 	len -= 4;
 
@@ -129,20 +131,15 @@ static int err_pkt(git_pkt **out, const char *line, size_t len)
 	GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
 	pkt = git__malloc(alloclen);
 	GITERR_CHECK_ALLOC(pkt);
-	pkt->type = GIT_PKT_ERR;
-	pkt->len = len;
 
+	pkt->type = GIT_PKT_ERR;
+	pkt->len = (int)len;
 	memcpy(pkt->error, line, len);
 	pkt->error[len] = '\0';
 
 	*out = (git_pkt *) pkt;
 
 	return 0;
-
-out_err:
-	giterr_set(GITERR_NET, "error parsing ERR pkt-line");
-	git__free(pkt);
-	return -1;
 }
 
 static int data_pkt(git_pkt **out, const char *line, size_t len)
@@ -158,7 +155,7 @@ static int data_pkt(git_pkt **out, const char *line, size_t len)
 	GITERR_CHECK_ALLOC(pkt);
 
 	pkt->type = GIT_PKT_DATA;
-	pkt->len = len;
+	pkt->len = (int) len;
 	memcpy(pkt->data, line, len);
 
 	*out = (git_pkt *) pkt;
@@ -179,7 +176,7 @@ static int sideband_progress_pkt(git_pkt **out, const char *line, size_t len)
 	GITERR_CHECK_ALLOC(pkt);
 
 	pkt->type = GIT_PKT_PROGRESS;
-	pkt->len = len;
+	pkt->len = (int) len;
 	memcpy(pkt->data, line, len);
 
 	*out = (git_pkt *) pkt;
@@ -215,25 +212,28 @@ static int sideband_error_pkt(git_pkt **out, const char *line, size_t len)
  */
 static int ref_pkt(git_pkt **out, const char *line, size_t len)
 {
+	int error;
 	git_pkt_ref *pkt;
 	size_t alloclen;
 
-	pkt = git__calloc(1, sizeof(git_pkt_ref));
+	pkt = git__malloc(sizeof(git_pkt_ref));
 	GITERR_CHECK_ALLOC(pkt);
-	pkt->type = GIT_PKT_REF;
 
-	if (len < GIT_OID_HEXSZ || git_oid_fromstr(&pkt->head.oid, line) < 0)
-		goto out_err;
-	line += GIT_OID_HEXSZ;
-	len -= GIT_OID_HEXSZ;
-
-	if (git__prefixncmp(line, len, " "))
-		goto out_err;
-	line++;
-	len--;
+	memset(pkt, 0x0, sizeof(git_pkt_ref));
+	pkt->type = GIT_PKT_REF;
+	if ((error = git_oid_fromstr(&pkt->head.oid, line)) < 0)
+		goto error_out;
+
+	/* Check for a bit of consistency */
+	if (line[GIT_OID_HEXSZ] != ' ') {
+		giterr_set(GITERR_NET, "error parsing pkt-line");
+		error = -1;
+		goto error_out;
+	}
 
-	if (!len)
-		goto out_err;
+	/* Jump from the name */
+	line += GIT_OID_HEXSZ + 1;
+	len -= (GIT_OID_HEXSZ + 1);
 
 	if (line[len - 1] == '\n')
 		--len;
@@ -245,36 +245,36 @@ static int ref_pkt(git_pkt **out, const char *line, size_t len)
 	memcpy(pkt->head.name, line, len);
 	pkt->head.name[len] = '\0';
 
-	if (strlen(pkt->head.name) < len)
+	if (strlen(pkt->head.name) < len) {
 		pkt->capabilities = strchr(pkt->head.name, '\0') + 1;
+	}
 
 	*out = (git_pkt *)pkt;
 	return 0;
 
-out_err:
-	giterr_set(GITERR_NET, "error parsing REF pkt-line");
-	if (pkt)
-		git__free(pkt->head.name);
+error_out:
 	git__free(pkt);
-	return -1;
+	return error;
 }
 
 static int ok_pkt(git_pkt **out, const char *line, size_t len)
 {
 	git_pkt_ok *pkt;
+	const char *ptr;
 	size_t alloc_len;
 
 	pkt = git__malloc(sizeof(*pkt));
 	GITERR_CHECK_ALLOC(pkt);
-	pkt->type = GIT_PKT_OK;
 
-	if (git__prefixncmp(line, len, "ok "))
-		goto out_err;
-	line += 3;
-	len -= 3;
+	pkt->type = GIT_PKT_OK;
 
-	if (line[len - 1] == '\n')
-		--len;
+	line += 3; /* skip "ok " */
+	if (!(ptr = strchr(line, '\n'))) {
+		giterr_set(GITERR_NET, "invalid packet line");
+		git__free(pkt);
+		return -1;
+	}
+	len = ptr - line;
 
 	GITERR_CHECK_ALLOC_ADD(&alloc_len, len, 1);
 	pkt->ref = git__malloc(alloc_len);
@@ -285,17 +285,12 @@ static int ok_pkt(git_pkt **out, const char *line, size_t len)
 
 	*out = (git_pkt *)pkt;
 	return 0;
-
-out_err:
-	giterr_set(GITERR_NET, "error parsing OK pkt-line");
-	git__free(pkt);
-	return -1;
 }
 
 static int ng_pkt(git_pkt **out, const char *line, size_t len)
 {
 	git_pkt_ng *pkt;
-	const char *ptr, *eol;
+	const char *ptr;
 	size_t alloclen;
 
 	pkt = git__malloc(sizeof(*pkt));
@@ -304,13 +299,8 @@ static int ng_pkt(git_pkt **out, const char *line, size_t len)
 	pkt->ref = NULL;
 	pkt->type = GIT_PKT_NG;
 
-	eol = line + len;
-
-	if (git__prefixncmp(line, len, "ng "))
-		goto out_err;
-	line += 3;
-
-	if (!(ptr = memchr(line, ' ', eol - line)))
+	line += 3; /* skip "ng " */
+	if (!(ptr = strchr(line, ' ')))
 		goto out_err;
 	len = ptr - line;
 
@@ -322,10 +312,7 @@ static int ng_pkt(git_pkt **out, const char *line, size_t len)
 	pkt->ref[len] = '\0';
 
 	line = ptr + 1;
-	if (line >= eol)
-		goto out_err;
-
-	if (!(ptr = memchr(line, '\n', eol - line)))
+	if (!(ptr = strchr(line, '\n')))
 		goto out_err;
 	len = ptr - line;
 
@@ -350,11 +337,13 @@ static int unpack_pkt(git_pkt **out, const char *line, size_t len)
 {
 	git_pkt_unpack *pkt;
 
+	GIT_UNUSED(len);
+
 	pkt = git__malloc(sizeof(*pkt));
 	GITERR_CHECK_ALLOC(pkt);
-	pkt->type = GIT_PKT_UNPACK;
 
-	if (!git__prefixncmp(line, len, "unpack ok"))
+	pkt->type = GIT_PKT_UNPACK;
+	if (!git__prefixcmp(line, "unpack ok"))
 		pkt->unpack_ok = 1;
 	else
 		pkt->unpack_ok = 0;
@@ -363,17 +352,13 @@ static int unpack_pkt(git_pkt **out, const char *line, size_t len)
 	return 0;
 }
 
-static int parse_len(size_t *out, const char *line, size_t linelen)
+static int32_t parse_len(const char *line)
 {
 	char num[PKT_LEN_SIZE + 1];
 	int i, k, error;
 	int32_t len;
 	const char *num_end;
 
-	/* Not even enough for the length */
-	if (linelen < PKT_LEN_SIZE)
-		return GIT_EBUFS;
-
 	memcpy(num, line, PKT_LEN_SIZE);
 	num[PKT_LEN_SIZE] = '\0';
 
@@ -385,7 +370,7 @@ static int parse_len(size_t *out, const char *line, size_t linelen)
 					num[k] = '.';
 				}
 			}
-
+			
 			giterr_set(GITERR_NET, "invalid hex digit in length: '%s'", num);
 			return -1;
 		}
@@ -394,11 +379,7 @@ static int parse_len(size_t *out, const char *line, size_t linelen)
 	if ((error = git__strtol32(&len, num, &num_end, 16)) < 0)
 		return error;
 
-	if (len < 0)
-		return -1;
-
-	*out = (size_t) len;
-	return 0;
+	return len;
 }
 
 /*
@@ -415,32 +396,35 @@ static int parse_len(size_t *out, const char *line, size_t linelen)
  */
 
 int git_pkt_parse_line(
-	git_pkt **pkt, const char **endptr, const char *line, size_t linelen)
+	git_pkt **head, const char *line, const char **out, size_t bufflen)
 {
-	int error;
-	size_t len;
+	int ret;
+	int32_t len;
 
-	if ((error = parse_len(&len, line, linelen)) < 0) {
+	/* Not even enough for the length */
+	if (bufflen > 0 && bufflen < PKT_LEN_SIZE)
+		return GIT_EBUFS;
+
+	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 or because we do not yet have
-		 * enough data.
+		 * If we fail to parse the length, it might be because the
+		 * server is trying to send us the packfile already.
 		 */
-		if (error == GIT_EBUFS)
-			;
-		else if (!git__prefixncmp(line, linelen, "PACK"))
-			giterr_set(GITERR_NET, "unexpected pack file");
-		else
-			giterr_set(GITERR_NET, "bad packet length");
-		return error;
+		if (bufflen >= 4 && !git__prefixcmp(line, "PACK")) {
+			giterr_clear();
+			*out = line;
+			return pack_pkt(head);
+		}
+
+		return (int)len;
 	}
 
 	/*
-	 * Make sure there is enough in the buffer to satisfy
-	 * this line.
+	 * If we were given a buffer length, then make sure there is
+	 * enough in the buffer to satisfy this line
 	 */
-	if (linelen < len)
+	if (bufflen > 0 && bufflen < (size_t)len)
 		return GIT_EBUFS;
 
 	/*
@@ -463,38 +447,38 @@ int git_pkt_parse_line(
 	}
 
 	if (len == 0) { /* Flush pkt */
-		*endptr = line;
-		return flush_pkt(pkt);
+		*out = line;
+		return flush_pkt(head);
 	}
 
 	len -= PKT_LEN_SIZE; /* the encoded length includes its own size */
 
 	if (*line == GIT_SIDE_BAND_DATA)
-		error = data_pkt(pkt, line, len);
+		ret = data_pkt(head, line, len);
 	else if (*line == GIT_SIDE_BAND_PROGRESS)
-		error = sideband_progress_pkt(pkt, line, len);
+		ret = sideband_progress_pkt(head, line, len);
 	else if (*line == GIT_SIDE_BAND_ERROR)
-		error = sideband_error_pkt(pkt, line, len);
-	else if (!git__prefixncmp(line, len, "ACK"))
-		error = ack_pkt(pkt, line, len);
-	else if (!git__prefixncmp(line, len, "NAK"))
-		error = nak_pkt(pkt);
-	else if (!git__prefixncmp(line, len, "ERR"))
-		error = err_pkt(pkt, line, len);
+		ret = sideband_error_pkt(head, line, len);
+	else if (!git__prefixcmp(line, "ACK"))
+		ret = ack_pkt(head, line, len);
+	else if (!git__prefixcmp(line, "NAK"))
+		ret = nak_pkt(head);
+	else if (!git__prefixcmp(line, "ERR "))
+		ret = err_pkt(head, line, len);
 	else if (*line == '#')
-		error = comment_pkt(pkt, line, len);
-	else if (!git__prefixncmp(line, len, "ok"))
-		error = ok_pkt(pkt, line, len);
-	else if (!git__prefixncmp(line, len, "ng"))
-		error = ng_pkt(pkt, line, len);
-	else if (!git__prefixncmp(line, len, "unpack"))
-		error = unpack_pkt(pkt, line, len);
+		ret = comment_pkt(head, line, len);
+	else if (!git__prefixcmp(line, "ok"))
+		ret = ok_pkt(head, line, len);
+	else if (!git__prefixcmp(line, "ng"))
+		ret = ng_pkt(head, line, len);
+	else if (!git__prefixcmp(line, "unpack"))
+		ret = unpack_pkt(head, line, len);
 	else
-		error = ref_pkt(pkt, line, len);
+		ret = ref_pkt(head, line, len);
 
-	*endptr = line + len;
+	*out = line + len;
 
-	return error;
+	return ret;
 }
 
 void git_pkt_free(git_pkt *pkt)