rugged 0.27.10 → 0.27.10.1

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

@@ -40,6 +40,7 @@ typedef enum {
 	GIT_PKT_HAVE,
 	GIT_PKT_ACK,
 	GIT_PKT_NAK,
+	GIT_PKT_PACK__UNUSED,
 	GIT_PKT_COMMENT,
 	GIT_PKT_ERR,
 	GIT_PKT_DATA,
@@ -49,7 +50,7 @@ typedef enum {
 	GIT_PKT_UNPACK,
 } git_pkt_type;
 
-/* Used for multi_ack and multi_ack_detailed */
+/* Used for multi_ack and mutli_ack_detailed */
 enum git_ack_status {
 	GIT_ACK_NONE,
 	GIT_ACK_CONTINUE,
@@ -177,8 +178,8 @@ int git_smart__negotiate_fetch(
 int git_smart__download_pack(
 	git_transport *transport,
 	git_repository *repo,
-	git_indexer_progress *stats,
-	git_indexer_progress_cb progress_cb,
+	git_transfer_progress *stats,
+	git_transfer_progress_cb progress_cb,
 	void *progress_payload);
 
 /* smart.c */

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

@@ -31,7 +31,7 @@ static int flush_pkt(git_pkt **out)
 	git_pkt *pkt;
 
 	pkt = git__malloc(sizeof(git_pkt));
-	GIT_ERROR_CHECK_ALLOC(pkt);
+	GITERR_CHECK_ALLOC(pkt);
 
 	pkt->type = GIT_PKT_FLUSH;
 	*out = pkt;
@@ -45,7 +45,7 @@ static int ack_pkt(git_pkt **out, const char *line, size_t len)
 	git_pkt_ack *pkt;
 
 	pkt = git__calloc(1, sizeof(git_pkt_ack));
-	GIT_ERROR_CHECK_ALLOC(pkt);
+	GITERR_CHECK_ALLOC(pkt);
 	pkt->type = GIT_PKT_ACK;
 
 	if (git__prefixncmp(line, len, "ACK "))
@@ -77,7 +77,7 @@ static int ack_pkt(git_pkt **out, const char *line, size_t len)
 	return 0;
 
 out_err:
-	git_error_set(GIT_ERROR_NET, "error parsing ACK pkt-line");
+	giterr_set(GITERR_NET, "error parsing ACK pkt-line");
 	git__free(pkt);
 	return -1;
 }
@@ -87,7 +87,7 @@ static int nak_pkt(git_pkt **out)
 	git_pkt *pkt;
 
 	pkt = git__malloc(sizeof(git_pkt));
-	GIT_ERROR_CHECK_ALLOC(pkt);
+	GITERR_CHECK_ALLOC(pkt);
 
 	pkt->type = GIT_PKT_NAK;
 	*out = pkt;
@@ -100,10 +100,10 @@ static int comment_pkt(git_pkt **out, const char *line, size_t len)
 	git_pkt_comment *pkt;
 	size_t alloclen;
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_comment), len);
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
+	GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_comment), len);
+	GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
 	pkt = git__malloc(alloclen);
-	GIT_ERROR_CHECK_ALLOC(pkt);
+	GITERR_CHECK_ALLOC(pkt);
 
 	pkt->type = GIT_PKT_COMMENT;
 	memcpy(pkt->comment, line, len);
@@ -125,10 +125,10 @@ static int err_pkt(git_pkt **out, const char *line, size_t len)
 	line += 4;
 	len -= 4;
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_progress), len);
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
+	GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_progress), len);
+	GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
 	pkt = git__malloc(alloclen);
-	GIT_ERROR_CHECK_ALLOC(pkt);
+	GITERR_CHECK_ALLOC(pkt);
 	pkt->type = GIT_PKT_ERR;
 	pkt->len = len;
 
@@ -140,7 +140,7 @@ static int err_pkt(git_pkt **out, const char *line, size_t len)
 	return 0;
 
 out_err:
-	git_error_set(GIT_ERROR_NET, "error parsing ERR pkt-line");
+	giterr_set(GITERR_NET, "error parsing ERR pkt-line");
 	git__free(pkt);
 	return -1;
 }
@@ -153,9 +153,9 @@ static int data_pkt(git_pkt **out, const char *line, size_t len)
 	line++;
 	len--;
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_progress), len);
+	GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_progress), len);
 	pkt = git__malloc(alloclen);
-	GIT_ERROR_CHECK_ALLOC(pkt);
+	GITERR_CHECK_ALLOC(pkt);
 
 	pkt->type = GIT_PKT_DATA;
 	pkt->len = len;
@@ -174,9 +174,9 @@ static int sideband_progress_pkt(git_pkt **out, const char *line, size_t len)
 	line++;
 	len--;
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_progress), len);
+	GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_pkt_progress), len);
 	pkt = git__malloc(alloclen);
-	GIT_ERROR_CHECK_ALLOC(pkt);
+	GITERR_CHECK_ALLOC(pkt);
 
 	pkt->type = GIT_PKT_PROGRESS;
 	pkt->len = len;
@@ -195,10 +195,10 @@ static int sideband_error_pkt(git_pkt **out, const char *line, size_t len)
 	line++;
 	len--;
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, sizeof(git_pkt_err), len);
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 1);
+	GITERR_CHECK_ALLOC_ADD(&alloc_len, sizeof(git_pkt_err), len);
+	GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 1);
 	pkt = git__malloc(alloc_len);
-	GIT_ERROR_CHECK_ALLOC(pkt);
+	GITERR_CHECK_ALLOC(pkt);
 
 	pkt->type = GIT_PKT_ERR;
 	pkt->len = (int)len;
@@ -219,7 +219,7 @@ static int ref_pkt(git_pkt **out, const char *line, size_t len)
 	size_t alloclen;
 
 	pkt = git__calloc(1, sizeof(git_pkt_ref));
-	GIT_ERROR_CHECK_ALLOC(pkt);
+	GITERR_CHECK_ALLOC(pkt);
 	pkt->type = GIT_PKT_REF;
 
 	if (len < GIT_OID_HEXSZ || git_oid_fromstr(&pkt->head.oid, line) < 0)
@@ -238,9 +238,9 @@ static int ref_pkt(git_pkt **out, const char *line, size_t len)
 	if (line[len - 1] == '\n')
 		--len;
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, len, 1);
+	GITERR_CHECK_ALLOC_ADD(&alloclen, len, 1);
 	pkt->head.name = git__malloc(alloclen);
-	GIT_ERROR_CHECK_ALLOC(pkt->head.name);
+	GITERR_CHECK_ALLOC(pkt->head.name);
 
 	memcpy(pkt->head.name, line, len);
 	pkt->head.name[len] = '\0';
@@ -252,7 +252,7 @@ static int ref_pkt(git_pkt **out, const char *line, size_t len)
 	return 0;
 
 out_err:
-	git_error_set(GIT_ERROR_NET, "error parsing REF pkt-line");
+	giterr_set(GITERR_NET, "error parsing REF pkt-line");
 	if (pkt)
 		git__free(pkt->head.name);
 	git__free(pkt);
@@ -265,7 +265,7 @@ static int ok_pkt(git_pkt **out, const char *line, size_t len)
 	size_t alloc_len;
 
 	pkt = git__malloc(sizeof(*pkt));
-	GIT_ERROR_CHECK_ALLOC(pkt);
+	GITERR_CHECK_ALLOC(pkt);
 	pkt->type = GIT_PKT_OK;
 
 	if (git__prefixncmp(line, len, "ok "))
@@ -276,9 +276,9 @@ static int ok_pkt(git_pkt **out, const char *line, size_t len)
 	if (line[len - 1] == '\n')
 		--len;
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, len, 1);
+	GITERR_CHECK_ALLOC_ADD(&alloc_len, len, 1);
 	pkt->ref = git__malloc(alloc_len);
-	GIT_ERROR_CHECK_ALLOC(pkt->ref);
+	GITERR_CHECK_ALLOC(pkt->ref);
 
 	memcpy(pkt->ref, line, len);
 	pkt->ref[len] = '\0';
@@ -287,7 +287,7 @@ static int ok_pkt(git_pkt **out, const char *line, size_t len)
 	return 0;
 
 out_err:
-	git_error_set(GIT_ERROR_NET, "error parsing OK pkt-line");
+	giterr_set(GITERR_NET, "error parsing OK pkt-line");
 	git__free(pkt);
 	return -1;
 }
@@ -299,7 +299,7 @@ static int ng_pkt(git_pkt **out, const char *line, size_t len)
 	size_t alloclen;
 
 	pkt = git__malloc(sizeof(*pkt));
-	GIT_ERROR_CHECK_ALLOC(pkt);
+	GITERR_CHECK_ALLOC(pkt);
 
 	pkt->ref = NULL;
 	pkt->type = GIT_PKT_NG;
@@ -314,9 +314,9 @@ static int ng_pkt(git_pkt **out, const char *line, size_t len)
 		goto out_err;
 	len = ptr - line;
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, len, 1);
+	GITERR_CHECK_ALLOC_ADD(&alloclen, len, 1);
 	pkt->ref = git__malloc(alloclen);
-	GIT_ERROR_CHECK_ALLOC(pkt->ref);
+	GITERR_CHECK_ALLOC(pkt->ref);
 
 	memcpy(pkt->ref, line, len);
 	pkt->ref[len] = '\0';
@@ -329,9 +329,9 @@ static int ng_pkt(git_pkt **out, const char *line, size_t len)
 		goto out_err;
 	len = ptr - line;
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, len, 1);
+	GITERR_CHECK_ALLOC_ADD(&alloclen, len, 1);
 	pkt->msg = git__malloc(alloclen);
-	GIT_ERROR_CHECK_ALLOC(pkt->msg);
+	GITERR_CHECK_ALLOC(pkt->msg);
 
 	memcpy(pkt->msg, line, len);
 	pkt->msg[len] = '\0';
@@ -340,7 +340,7 @@ static int ng_pkt(git_pkt **out, const char *line, size_t len)
 	return 0;
 
 out_err:
-	git_error_set(GIT_ERROR_NET, "invalid packet line");
+	giterr_set(GITERR_NET, "invalid packet line");
 	git__free(pkt->ref);
 	git__free(pkt);
 	return -1;
@@ -351,7 +351,7 @@ static int unpack_pkt(git_pkt **out, const char *line, size_t len)
 	git_pkt_unpack *pkt;
 
 	pkt = git__malloc(sizeof(*pkt));
-	GIT_ERROR_CHECK_ALLOC(pkt);
+	GITERR_CHECK_ALLOC(pkt);
 	pkt->type = GIT_PKT_UNPACK;
 
 	if (!git__prefixncmp(line, len, "unpack ok"))
@@ -386,7 +386,7 @@ static int parse_len(size_t *out, const char *line, size_t linelen)
 				}
 			}
 
-			git_error_set(GIT_ERROR_NET, "invalid hex digit in length: '%s'", num);
+			giterr_set(GITERR_NET, "invalid hex digit in length: '%s'", num);
 			return -1;
 		}
 	}
@@ -430,9 +430,9 @@ int git_pkt_parse_line(
 		if (error == GIT_EBUFS)
 			;
 		else if (!git__prefixncmp(line, linelen, "PACK"))
-			git_error_set(GIT_ERROR_NET, "unexpected pack file");
+			giterr_set(GITERR_NET, "unexpected pack file");
 		else
-			git_error_set(GIT_ERROR_NET, "bad packet length");
+			giterr_set(GITERR_NET, "bad packet length");
 		return error;
 	}
 
@@ -458,7 +458,7 @@ int git_pkt_parse_line(
 	 * line, we should return an error upon hitting one.
 	 */
 	if (len == PKT_LEN_SIZE) {
-		git_error_set_str(GIT_ERROR_NET, "Invalid empty packet");
+		giterr_set_str(GITERR_NET, "Invalid empty packet");
 		return GIT_ERROR;
 	}
 
@@ -499,9 +499,6 @@ int git_pkt_parse_line(
 
 void git_pkt_free(git_pkt *pkt)
 {
-	if (pkt == NULL) {
-		return;
-	}
 	if (pkt->type == GIT_PKT_REF) {
 		git_pkt_ref *p = (git_pkt_ref *) pkt;
 		git__free(p->head.name);
@@ -561,7 +558,7 @@ static int buffer_want_with_caps(const git_remote_head *head, transport_smart_ca
 		 git_buf_len(&str) + 1 /* LF */;
 
 	if (len > 0xffff) {
-		git_error_set(GIT_ERROR_NET,
+		giterr_set(GITERR_NET,
 			"tried to produce packet with invalid length %" PRIuZ, len);
 		return -1;
 	}
@@ -570,9 +567,9 @@ static int buffer_want_with_caps(const git_remote_head *head, transport_smart_ca
 	git_oid_fmt(oid, &head->oid);
 	git_buf_printf(buf,
 		"%04xwant %s %s\n", (unsigned int)len, oid, git_buf_cstr(&str));
-	git_buf_dispose(&str);
+	git_buf_free(&str);
 
-	GIT_ERROR_CHECK_ALLOC_BUF(buf);
+	GITERR_CHECK_ALLOC_BUF(buf);
 
 	return 0;
 }

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

@@ -17,7 +17,6 @@
 #include "pack-objects.h"
 #include "remote.h"
 #include "util.h"
-#include "revwalk.h"
 
 #define NETWORK_XFER_THRESHOLD (100*1024)
 /* The minimal interval between progress updates (in seconds). */
@@ -57,7 +56,7 @@ int git_smart__store_refs(transport_smart *t, int flushes)
 				return recvd;
 
 			if (recvd == 0) {
-				git_error_set(GIT_ERROR_NET, "early EOF");
+				giterr_set(GITERR_NET, "early EOF");
 				return GIT_EEOF;
 			}
 
@@ -66,7 +65,7 @@ int git_smart__store_refs(transport_smart *t, int flushes)
 
 		gitno_consume(buf, line_end);
 		if (pkt->type == GIT_PKT_ERR) {
-			git_error_set(GIT_ERROR_NET, "remote error: %s", ((git_pkt_err *)pkt)->error);
+			giterr_set(GITERR_NET, "remote error: %s", ((git_pkt_err *)pkt)->error);
 			git__free(pkt);
 			return -1;
 		}
@@ -104,14 +103,14 @@ static int append_symref(const char **out, git_vector *symrefs, const char *ptr)
 
 	/* symref mapping has refspec format */
 	mapping = git__calloc(1, sizeof(git_refspec));
-	GIT_ERROR_CHECK_ALLOC(mapping);
+	GITERR_CHECK_ALLOC(mapping);
 
 	error = git_refspec__parse(mapping, git_buf_cstr(&buf), true);
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	/* if the error isn't OOM, then it's a parse error; let's use a nicer message */
 	if (error < 0) {
-		if (git_error_last()->klass != GIT_ERROR_NOMEMORY)
+		if (giterr_last()->klass != GITERR_NOMEMORY)
 			goto on_invalid;
 
 		git__free(mapping);
@@ -125,8 +124,8 @@ static int append_symref(const char **out, git_vector *symrefs, const char *ptr)
 	return 0;
 
 on_invalid:
-	git_error_set(GIT_ERROR_NET, "remote sent invalid symref");
-	git_refspec__dispose(mapping);
+	giterr_set(GITERR_NET, "remote sent invalid symref");
+	git_refspec__free(mapping);
 	git__free(mapping);
 	return -1;
 }
@@ -137,7 +136,7 @@ int git_smart__detect_caps(git_pkt_ref *pkt, transport_smart_caps *caps, git_vec
 
 	/* No refs or capabilites, odd but not a problem */
 	if (pkt == NULL || pkt->capabilities == NULL)
-		return GIT_ENOTFOUND;
+		return 0;
 
 	ptr = pkt->capabilities;
 	while (ptr != NULL && *ptr != '\0') {
@@ -210,7 +209,7 @@ int git_smart__detect_caps(git_pkt_ref *pkt, transport_smart_caps *caps, git_vec
 	return 0;
 }
 
-static int recv_pkt(git_pkt **out_pkt, git_pkt_type *out_type, gitno_buffer *buf)
+static int recv_pkt(git_pkt **out, git_pkt_type *pkt_type, gitno_buffer *buf)
 {
 	const char *ptr = buf->data, *line_end = ptr;
 	git_pkt *pkt = NULL;
@@ -231,16 +230,16 @@ static int recv_pkt(git_pkt **out_pkt, git_pkt_type *out_type, gitno_buffer *buf
 		if ((ret = gitno_recv(buf)) < 0) {
 			return ret;
 		} else if (ret == 0) {
-			git_error_set(GIT_ERROR_NET, "early EOF");
+			giterr_set(GITERR_NET, "early EOF");
 			return GIT_EEOF;
 		}
 	} while (error);
 
 	gitno_consume(buf, line_end);
-	if (out_type != NULL)
-		*out_type = pkt->type;
-	if (out_pkt != NULL)
-		*out_pkt = pkt;
+	if (pkt_type)
+		*pkt_type = pkt->type;
+	if (out != NULL)
+		*out = pkt;
 	else
 		git__free(pkt);
 
@@ -257,54 +256,93 @@ static int store_common(transport_smart *t)
 		if ((error = recv_pkt(&pkt, NULL, buf)) < 0)
 			return error;
 
-		if (pkt->type != GIT_PKT_ACK) {
+		if (pkt->type == GIT_PKT_ACK) {
+			if (git_vector_insert(&t->common, pkt) < 0)
+				return -1;
+		} else {
 			git__free(pkt);
 			return 0;
 		}
 
-		if (git_vector_insert(&t->common, pkt) < 0) {
-			git__free(pkt);
-			return -1;
-		}
 	} while (1);
 
 	return 0;
 }
 
+static int fetch_setup_walk(git_revwalk **out, git_repository *repo)
+{
+	git_revwalk *walk = NULL;
+	git_strarray refs;
+	unsigned int i;
+	git_reference *ref = NULL;
+	int error;
+
+	if ((error = git_reference_list(&refs, repo)) < 0)
+		return error;
+
+	if ((error = git_revwalk_new(&walk, repo)) < 0)
+		return error;
+
+	git_revwalk_sorting(walk, GIT_SORT_TIME);
+
+	for (i = 0; i < refs.count; ++i) {
+		git_reference_free(ref);
+		ref = NULL;
+
+		/* No tags */
+		if (!git__prefixcmp(refs.strings[i], GIT_REFS_TAGS_DIR))
+			continue;
+
+		if ((error = git_reference_lookup(&ref, repo, refs.strings[i])) < 0)
+			goto on_error;
+
+		if (git_reference_type(ref) == GIT_REF_SYMBOLIC)
+			continue;
+
+		if ((error = git_revwalk_push(walk, git_reference_target(ref))) < 0)
+			goto on_error;
+	}
+
+	*out = walk;
+
+on_error:
+	if (error)
+		git_revwalk_free(walk);
+	git_reference_free(ref);
+	git_strarray_free(&refs);
+	return error;
+}
+
 static int wait_while_ack(gitno_buffer *buf)
 {
 	int error;
-	git_pkt *pkt = NULL;
-	git_pkt_ack *ack = NULL;
+	git_pkt_ack *pkt = NULL;
 
 	while (1) {
-		git_pkt_free(pkt);
+		git__free(pkt);
 
-		if ((error = recv_pkt(&pkt, NULL, buf)) < 0)
+		if ((error = recv_pkt((git_pkt **)&pkt, NULL, buf)) < 0)
 			return error;
 
 		if (pkt->type == GIT_PKT_NAK)
 			break;
-		if (pkt->type != GIT_PKT_ACK)
-			continue;
-
-		ack = (git_pkt_ack*)pkt;
 
-		if (ack->status != GIT_ACK_CONTINUE &&
-		    ack->status != GIT_ACK_COMMON &&
-		    ack->status != GIT_ACK_READY) {
-			break;
+		if (pkt->type == GIT_PKT_ACK &&
+		    (pkt->status != GIT_ACK_CONTINUE &&
+		     pkt->status != GIT_ACK_COMMON &&
+		     pkt->status != GIT_ACK_READY)) {
+			git__free(pkt);
+			return 0;
 		}
 	}
 
-	git_pkt_free(pkt);
+	git__free(pkt);
 	return 0;
 }
 
 int git_smart__negotiate_fetch(git_transport *transport, git_repository *repo, const git_remote_head * const *wants, size_t count)
 {
 	transport_smart *t = (transport_smart *)transport;
-	git_revwalk__push_options opts = GIT_REVWALK__PUSH_OPTIONS_INIT;
 	gitno_buffer *buf = &t->buffer;
 	git_buf data = GIT_BUF_INIT;
 	git_revwalk *walk = NULL;
@@ -316,11 +354,7 @@ int git_smart__negotiate_fetch(git_transport *transport, git_repository *repo, c
 	if ((error = git_pkt_buffer_wants(wants, count, &t->caps, &data)) < 0)
 		return error;
 
-	if ((error = git_revwalk_new(&walk, repo)) < 0)
-		goto on_error;
-
-	opts.insert_by_date = 1;
-	if ((error = git_revwalk__push_glob(walk, "refs/*", &opts)) < 0)
+	if ((error = fetch_setup_walk(&walk, repo)) < 0)
 		goto on_error;
 
 	/*
@@ -344,7 +378,7 @@ int git_smart__negotiate_fetch(git_transport *transport, git_repository *repo, c
 		i++;
 		if (i % 20 == 0) {
 			if (t->cancelled.val) {
-				git_error_set(GIT_ERROR_NET, "The fetch was cancelled by the user");
+				giterr_set(GITERR_NET, "The fetch was cancelled by the user");
 				error = GIT_EUSER;
 				goto on_error;
 			}
@@ -363,15 +397,15 @@ int git_smart__negotiate_fetch(git_transport *transport, git_repository *repo, c
 				if ((error = store_common(t)) < 0)
 					goto on_error;
 			} else {
-				if ((error = recv_pkt(NULL, &pkt_type, buf)) < 0)
+				error = recv_pkt(NULL, &pkt_type, buf);
+				if (error < 0) {
 					goto on_error;
-
-				if (pkt_type == GIT_PKT_ACK) {
+				} else if (pkt_type == GIT_PKT_ACK) {
 					break;
 				} else if (pkt_type == GIT_PKT_NAK) {
 					continue;
 				} else {
-					git_error_set(GIT_ERROR_NET, "Unexpected pkt type");
+					giterr_set(GITERR_NET, "Unexpected pkt type");
 					error = -1;
 					goto on_error;
 				}
@@ -423,23 +457,24 @@ int git_smart__negotiate_fetch(git_transport *transport, git_repository *repo, c
 		goto on_error;
 
 	if (t->cancelled.val) {
-		git_error_set(GIT_ERROR_NET, "The fetch was cancelled by the user");
+		giterr_set(GITERR_NET, "The fetch was cancelled by the user");
 		error = GIT_EUSER;
 		goto on_error;
 	}
 	if ((error = git_smart__negotiation_step(&t->parent, data.ptr, data.size)) < 0)
 		goto on_error;
 
-	git_buf_dispose(&data);
+	git_buf_free(&data);
 	git_revwalk_free(walk);
 
 	/* Now let's eat up whatever the server gives us */
 	if (!t->caps.multi_ack && !t->caps.multi_ack_detailed) {
-		if ((error = recv_pkt(NULL, &pkt_type, buf)) < 0)
-			return error;
+		error = recv_pkt(NULL, &pkt_type, buf);
 
-		if (pkt_type != GIT_PKT_ACK && pkt_type != GIT_PKT_NAK) {
-			git_error_set(GIT_ERROR_NET, "Unexpected pkt type");
+		if (error < 0) {
+			return error;
+		} else if (pkt_type != GIT_PKT_ACK && pkt_type != GIT_PKT_NAK) {
+			giterr_set(GITERR_NET, "Unexpected pkt type");
 			return -1;
 		}
 	} else {
@@ -450,17 +485,17 @@ int git_smart__negotiate_fetch(git_transport *transport, git_repository *repo, c
 
 on_error:
 	git_revwalk_free(walk);
-	git_buf_dispose(&data);
+	git_buf_free(&data);
 	return error;
 }
 
-static int no_sideband(transport_smart *t, struct git_odb_writepack *writepack, gitno_buffer *buf, git_indexer_progress *stats)
+static int no_sideband(transport_smart *t, struct git_odb_writepack *writepack, gitno_buffer *buf, git_transfer_progress *stats)
 {
 	int recvd;
 
 	do {
 		if (t->cancelled.val) {
-			git_error_set(GIT_ERROR_NET, "The fetch was cancelled by the user");
+			giterr_set(GITERR_NET, "The fetch was cancelled by the user");
 			return GIT_EUSER;
 		}
 
@@ -481,9 +516,9 @@ static int no_sideband(transport_smart *t, struct git_odb_writepack *writepack,
 
 struct network_packetsize_payload
 {
-	git_indexer_progress_cb callback;
+	git_transfer_progress_cb callback;
 	void *payload;
-	git_indexer_progress *stats;
+	git_transfer_progress *stats;
 	size_t last_fired_bytes;
 };
 
@@ -508,8 +543,8 @@ static int network_packetsize(size_t received, void *payload)
 int git_smart__download_pack(
 	git_transport *transport,
 	git_repository *repo,
-	git_indexer_progress *stats,
-	git_indexer_progress_cb progress_cb,
+	git_transfer_progress *stats,
+	git_transfer_progress_cb transfer_progress_cb,
 	void *progress_payload)
 {
 	transport_smart *t = (transport_smart *)transport;
@@ -519,10 +554,10 @@ int git_smart__download_pack(
 	int error = 0;
 	struct network_packetsize_payload npp = {0};
 
-	memset(stats, 0, sizeof(git_indexer_progress));
+	memset(stats, 0, sizeof(git_transfer_progress));
 
-	if (progress_cb) {
-		npp.callback = progress_cb;
+	if (transfer_progress_cb) {
+		npp.callback = transfer_progress_cb;
 		npp.payload = progress_payload;
 		npp.stats = stats;
 		t->packetsize_cb = &network_packetsize;
@@ -535,7 +570,7 @@ int git_smart__download_pack(
 	}
 
 	if ((error = git_repository_odb__weakptr(&odb, repo)) < 0 ||
-		((error = git_odb_write_pack(&writepack, odb, progress_cb, progress_payload)) != 0))
+		((error = git_odb_write_pack(&writepack, odb, transfer_progress_cb, progress_payload)) != 0))
 		goto done;
 
 	/*
@@ -553,7 +588,7 @@ int git_smart__download_pack(
 
 		/* Check cancellation before network call */
 		if (t->cancelled.val) {
-			git_error_clear();
+			giterr_clear();
 			error = GIT_EUSER;
 			goto done;
 		}
@@ -561,19 +596,12 @@ int git_smart__download_pack(
 		if ((error = recv_pkt(&pkt, NULL, buf)) >= 0) {
 			/* Check cancellation after network call */
 			if (t->cancelled.val) {
-				git_error_clear();
+				giterr_clear();
 				error = GIT_EUSER;
 			} else if (pkt->type == GIT_PKT_PROGRESS) {
 				if (t->progress_cb) {
 					git_pkt_progress *p = (git_pkt_progress *) pkt;
-
-					if (p->len > INT_MAX) {
-						git_error_set(GIT_ERROR_NET, "oversized progress message");
-						error = GIT_ERROR;
-						goto done;
-					}
-
-					error = t->progress_cb(p->data, (int)p->len, t->message_cb_payload);
+					error = t->progress_cb(p->data, p->len, t->message_cb_payload);
 				}
 			} else if (pkt->type == GIT_PKT_DATA) {
 				git_pkt_data *p = (git_pkt_data *) pkt;
@@ -587,15 +615,14 @@ int git_smart__download_pack(
 			}
 		}
 
-		git_pkt_free(pkt);
-
+		git__free(pkt);
 		if (error < 0)
 			goto done;
 
 	} while (1);
 
 	/*
-	 * Trailing execution of progress_cb, if necessary...
+	 * Trailing execution of transfer_progress_cb, if necessary...
 	 * Only the callback through the npp datastructure currently
 	 * updates the last_fired_bytes value. It is possible that
 	 * progress has already been reported with the correct
@@ -614,7 +641,7 @@ int git_smart__download_pack(
 done:
 	if (writepack)
 		writepack->free(writepack);
-	if (progress_cb) {
+	if (transfer_progress_cb) {
 		t->packetsize_cb = NULL;
 		t->packetsize_payload = NULL;
 	}
@@ -670,7 +697,7 @@ static int add_push_report_pkt(git_push *push, git_pkt *pkt)
 	switch (pkt->type) {
 		case GIT_PKT_OK:
 			status = git__calloc(1, sizeof(push_status));
-			GIT_ERROR_CHECK_ALLOC(status);
+			GITERR_CHECK_ALLOC(status);
 			status->msg = NULL;
 			status->ref = git__strdup(((git_pkt_ok *)pkt)->ref);
 			if (!status->ref ||
@@ -681,7 +708,7 @@ static int add_push_report_pkt(git_push *push, git_pkt *pkt)
 			break;
 		case GIT_PKT_NG:
 			status = git__calloc(1, sizeof(push_status));
-			GIT_ERROR_CHECK_ALLOC(status);
+			GITERR_CHECK_ALLOC(status);
 			status->ref = git__strdup(((git_pkt_ng *)pkt)->ref);
 			status->msg = git__strdup(((git_pkt_ng *)pkt)->msg);
 			if (!status->ref || !status->msg ||
@@ -696,7 +723,7 @@ static int add_push_report_pkt(git_push *push, git_pkt *pkt)
 		case GIT_PKT_FLUSH:
 			return GIT_ITEROVER;
 		default:
-			git_error_set(GIT_ERROR_NET, "report-status: protocol error");
+			giterr_set(GITERR_NET, "report-status: protocol error");
 			return -1;
 	}
 
@@ -784,7 +811,7 @@ static int parse_report(transport_smart *transport, git_push *push)
 			}
 
 			if (recvd == 0) {
-				git_error_set(GIT_ERROR_NET, "early EOF");
+				giterr_set(GITERR_NET, "early EOF");
 				error = GIT_EEOF;
 				goto done;
 			}
@@ -801,21 +828,14 @@ static int parse_report(transport_smart *transport, git_push *push)
 				error = add_push_report_sideband_pkt(push, (git_pkt_data *)pkt, &data_pkt_buf);
 				break;
 			case GIT_PKT_ERR:
-				git_error_set(GIT_ERROR_NET, "report-status: Error reported: %s",
+				giterr_set(GITERR_NET, "report-status: Error reported: %s",
 					((git_pkt_err *)pkt)->error);
 				error = -1;
 				break;
 			case GIT_PKT_PROGRESS:
 				if (transport->progress_cb) {
 					git_pkt_progress *p = (git_pkt_progress *) pkt;
-
-					if (p->len > INT_MAX) {
-						git_error_set(GIT_ERROR_NET, "oversized progress message");
-						error = GIT_ERROR;
-						goto done;
-					}
-
-					error = transport->progress_cb(p->data, (int)p->len, transport->message_cb_payload);
+					error = transport->progress_cb(p->data, p->len, transport->message_cb_payload);
 				}
 				break;
 			default:
@@ -831,7 +851,7 @@ static int parse_report(transport_smart *transport, git_push *push)
 			if (data_pkt_buf.size > 0) {
 				/* If there was data remaining in the pack data buffer,
 				 * then the server sent a partial pkt-line */
-				git_error_set(GIT_ERROR_NET, "Incomplete pack data pkt-line");
+				giterr_set(GITERR_NET, "Incomplete pack data pkt-line");
 				error = GIT_ERROR;
 			}
 			goto done;
@@ -842,14 +862,14 @@ static int parse_report(transport_smart *transport, git_push *push)
 		}
 	}
 done:
-	git_buf_dispose(&data_pkt_buf);
+	git_buf_free(&data_pkt_buf);
 	return error;
 }
 
 static int add_ref_from_push_spec(git_vector *refs, push_spec *push_spec)
 {
 	git_pkt_ref *added = git__calloc(1, sizeof(git_pkt_ref));
-	GIT_ERROR_CHECK_ALLOC(added);
+	GITERR_CHECK_ALLOC(added);
 
 	added->type = GIT_PKT_REF;
 	git_oid_cpy(&added->head.oid, &push_spec->loid);
@@ -878,7 +898,7 @@ static int update_refs_from_report(
 	/* For each push spec we sent to the server, we should have
 	 * gotten back a status packet in the push report */
 	if (push_specs->length != push_report->length) {
-		git_error_set(GIT_ERROR_NET, "report-status: protocol error");
+		giterr_set(GITERR_NET, "report-status: protocol error");
 		return -1;
 	}
 
@@ -893,7 +913,7 @@ static int update_refs_from_report(
 		/* For each push spec we sent to the server, we should have
 		 * gotten back a status packet in the push report which matches */
 		if (strcmp(push_spec->refspec.dst, push_status->ref)) {
-			git_error_set(GIT_ERROR_NET, "report-status: protocol error");
+			giterr_set(GITERR_NET, "report-status: protocol error");
 			return -1;
 		}
 	}
@@ -939,7 +959,7 @@ static int update_refs_from_report(
 
 	/* Remove any refs which we updated to have a zero OID. */
 	git_vector_rforeach(refs, i, ref) {
-		if (git_oid_is_zero(&ref->head.oid)) {
+		if (git_oid_iszero(&ref->head.oid)) {
 			git_vector_remove(refs, i);
 			git_pkt_free((git_pkt *)ref);
 		}
@@ -954,7 +974,7 @@ struct push_packbuilder_payload
 {
 	git_smart_subtransport_stream *stream;
 	git_packbuilder *pb;
-	git_push_transfer_progress_cb cb;
+	git_push_transfer_progress cb;
 	void *cb_payload;
 	size_t last_bytes;
 	double last_progress_report_time;
@@ -1065,6 +1085,6 @@ int git_smart__push(git_transport *transport, git_push *push, const git_remote_c
 	}
 
 done:
-	git_buf_dispose(&pktline);
+	git_buf_free(&pktline);
 	return error;
 }