rugged 0.28.4 → 0.28.4.1

data/vendor/libgit2/src/index.c

@@ -29,18 +29,18 @@
 
 #define INSERT_IN_MAP_EX(idx, map, e, err) do {				\
 		if ((idx)->ignore_case)					\
-			(err) = git_idxmap_icase_set((git_idxmap_icase *) (map), (e), (e)); \
+			git_idxmap_icase_insert((git_idxmap_icase *) (map), (e), (e), (err)); \
 		else							\
-			(err) = git_idxmap_set((map), (e), (e));	\
+			git_idxmap_insert((map), (e), (e), (err));	\
 	} while (0)
 
 #define INSERT_IN_MAP(idx, e, err) INSERT_IN_MAP_EX(idx, (idx)->entries_map, e, err)
 
-#define LOOKUP_IN_MAP(v, idx, k) do {					\
+#define LOOKUP_IN_MAP(p, idx, k) do {					\
 		if ((idx)->ignore_case)					\
-			(v) = git_idxmap_icase_get((git_idxmap_icase *) index->entries_map, (k)); \
+			(p) = git_idxmap_icase_lookup_index((git_idxmap_icase *) index->entries_map, (k)); \
 		else							\
-			(v) = git_idxmap_get(index->entries_map, (k)); \
+			(p) = git_idxmap_lookup_index(index->entries_map, (k)); \
 	} while (0)
 
 #define DELETE_IN_MAP(idx, e) do {					\
@@ -423,10 +423,10 @@ int git_index_open(git_index **index_out, const char *index_path)
 	}
 
 	if (git_vector_init(&index->entries, 32, git_index_entry_cmp) < 0 ||
-	    git_idxmap_new(&index->entries_map) < 0 ||
-	    git_vector_init(&index->names, 8, conflict_name_cmp) < 0 ||
-	    git_vector_init(&index->reuc, 8, reuc_cmp) < 0 ||
-	    git_vector_init(&index->deleted, 8, git_index_entry_cmp) < 0)
+		git_idxmap_alloc(&index->entries_map) < 0 ||
+		git_vector_init(&index->names, 8, conflict_name_cmp) < 0 ||
+		git_vector_init(&index->reuc, 8, reuc_cmp) < 0 ||
+		git_vector_init(&index->deleted, 8, git_index_entry_cmp) < 0)
 		goto fail;
 
 	index->entries_cmp_path = git__strcmp_cb;
@@ -570,11 +570,11 @@ int git_index_set_caps(git_index *index, int caps)
 			return create_index_error(
 				-1, "cannot access repository to set index caps");
 
-		if (!git_repository__configmap_lookup(&val, repo, GIT_CONFIGMAP_IGNORECASE))
+		if (!git_repository__cvar(&val, repo, GIT_CVAR_IGNORECASE))
 			index->ignore_case = (val != 0);
-		if (!git_repository__configmap_lookup(&val, repo, GIT_CONFIGMAP_FILEMODE))
+		if (!git_repository__cvar(&val, repo, GIT_CVAR_FILEMODE))
 			index->distrust_filemode = (val == 0);
-		if (!git_repository__configmap_lookup(&val, repo, GIT_CONFIGMAP_SYMLINKS))
+		if (!git_repository__cvar(&val, repo, GIT_CVAR_SYMLINKS))
 			index->no_symlinks = (val == 0);
 	}
 	else {
@@ -852,21 +852,20 @@ const git_index_entry *git_index_get_bypath(
 	git_index *index, const char *path, int stage)
 {
 	git_index_entry key = {{ 0 }};
-	git_index_entry *value;
+	size_t pos;
 
 	assert(index);
 
 	key.path = path;
 	GIT_INDEX_ENTRY_STAGE_SET(&key, stage);
 
-	LOOKUP_IN_MAP(value, index, &key);
+	LOOKUP_IN_MAP(pos, index, &key);
 
-	if (!value) {
-	    git_error_set(GIT_ERROR_INDEX, "index does not contain '%s'", path);
-	    return NULL;
-	}
+	if (git_idxmap_valid_index(index->entries_map, pos))
+		return git_idxmap_value_at(index->entries_map, pos);
 
-	return value;
+	git_error_set(GIT_ERROR_INDEX, "index does not contain '%s'", path);
+	return NULL;
 }
 
 void git_index_entry__init_from_stat(
@@ -1402,7 +1401,7 @@ static int index_insert(
 		if ((error = git_vector_insert_sorted(&index->entries, entry, index_no_dups)) < 0)
 			goto out;
 
-		INSERT_IN_MAP(index, entry, error);
+		INSERT_IN_MAP(index, entry, &error);
 	}
 
 	index->dirty = 1;
@@ -1454,7 +1453,7 @@ GIT_INLINE(bool) valid_filemode(const int filemode)
 	return (is_file_or_link(filemode) || filemode == GIT_FILEMODE_COMMIT);
 }
 
-int git_index_add_from_buffer(
+int git_index_add_frombuffer(
     git_index *index, const git_index_entry *source_entry,
     const void *buffer, size_t len)
 {
@@ -1474,22 +1473,17 @@ int git_index_add_from_buffer(
 		return -1;
 	}
 
-	if (len > UINT32_MAX) {
-		git_error_set(GIT_ERROR_INDEX, "buffer is too large");
-		return -1;
-	}
-
 	if (index_entry_dup(&entry, index, source_entry) < 0)
 		return -1;
 
-	error = git_blob_create_from_buffer(&id, INDEX_OWNER(index), buffer, len);
+	error = git_blob_create_frombuffer(&id, INDEX_OWNER(index), buffer, len);
 	if (error < 0) {
 		index_entry_free(entry);
 		return error;
 	}
 
 	git_oid_cpy(&entry->id, &id);
-	entry->file_size = (uint32_t)len;
+	entry->file_size = len;
 
 	if ((error = index_insert(index, &entry, 1, true, true, true)) < 0)
 		return error;
@@ -1624,9 +1618,8 @@ int git_index__fill(git_index *index, const git_vector *source_entries)
 	if (!source_entries->length)
 		return 0;
 
-	if (git_vector_size_hint(&index->entries, source_entries->length) < 0 ||
-	    git_idxmap_resize(index->entries_map, (size_t)(source_entries->length * 1.3)) < 0)
-		return -1;
+	git_vector_size_hint(&index->entries, source_entries->length);
+	git_idxmap_resize(index->entries_map, (size_t)(source_entries->length * 1.3));
 
 	git_vector_foreach(source_entries, i, source_entry) {
 		git_index_entry *entry = NULL;
@@ -1641,7 +1634,7 @@ int git_index__fill(git_index *index, const git_vector *source_entries)
 		if ((ret = git_vector_insert(&index->entries, entry)) < 0)
 			break;
 
-		INSERT_IN_MAP(index, entry, ret);
+		INSERT_IN_MAP(index, entry, &ret);
 		if (ret < 0)
 			break;
 
@@ -2614,12 +2607,10 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size)
 
 	assert(!index->entries.length);
 
-	if (index->ignore_case &&
-	    (error = git_idxmap_icase_resize((git_idxmap_icase *) index->entries_map,
-					     header.entry_count)) < 0)
-		return error;
-	else if ((error = git_idxmap_resize(index->entries_map, header.entry_count)) < 0)
-		return error;
+	if (index->ignore_case)
+		git_idxmap_icase_resize((git_idxmap_icase *) index->entries_map, header.entry_count);
+	else
+		git_idxmap_resize(index->entries_map, header.entry_count);
 
 	/* Parse all the entries */
 	for (i = 0; i < header.entry_count && buffer_size > INDEX_FOOTER_SIZE; ++i) {
@@ -2636,7 +2627,7 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size)
 			goto done;
 		}
 
-		INSERT_IN_MAP(index, entry, error);
+		INSERT_IN_MAP(index, entry, &error);
 
 		if (error < 0) {
 			index_entry_free(entry);
@@ -3115,7 +3106,7 @@ int git_index_read_tree(git_index *index, const git_tree *tree)
 	size_t i;
 	git_index_entry *e;
 
-	if (git_idxmap_new(&entries_map) < 0)
+	if (git_idxmap_alloc(&entries_map) < 0)
 		return -1;
 
 	git_vector_set_cmp(&entries, index->entries._cmp); /* match sort */
@@ -3133,15 +3124,13 @@ int git_index_read_tree(git_index *index, const git_tree *tree)
 	if ((error = git_tree_walk(tree, GIT_TREEWALK_POST, read_tree_cb, &data)) < 0)
 		goto cleanup;
 
-	if (index->ignore_case &&
-	    (error = git_idxmap_icase_resize((git_idxmap_icase *) entries_map,
-					     entries.length)) < 0)
-		goto cleanup;
-	else if ((error = git_idxmap_resize(entries_map, entries.length)) < 0)
-		goto cleanup;
+	if (index->ignore_case)
+		git_idxmap_icase_resize((git_idxmap_icase *) entries_map, entries.length);
+	else
+		git_idxmap_resize(entries_map, entries.length);
 
 	git_vector_foreach(&entries, i, e) {
-		INSERT_IN_MAP_EX(index, entries_map, e, error);
+		INSERT_IN_MAP_EX(index, entries_map, e, &error);
 
 		if (error < 0) {
 			git_error_set(GIT_ERROR_INDEX, "failed to insert entry into map");
@@ -3191,17 +3180,14 @@ static int git_index_read_iterator(
 	assert((new_iterator->flags & GIT_ITERATOR_DONT_IGNORE_CASE));
 
 	if ((error = git_vector_init(&new_entries, new_length_hint, index->entries._cmp)) < 0 ||
-	    (error = git_vector_init(&remove_entries, index->entries.length, NULL)) < 0 ||
-	    (error = git_idxmap_new(&new_entries_map)) < 0)
+		(error = git_vector_init(&remove_entries, index->entries.length, NULL)) < 0 ||
+		(error = git_idxmap_alloc(&new_entries_map)) < 0)
 		goto done;
 
-	if (index->ignore_case && new_length_hint &&
-	    (error = git_idxmap_icase_resize((git_idxmap_icase *) new_entries_map,
-					     new_length_hint)) < 0)
-		goto done;
-	else if (new_length_hint &&
-	         (error = git_idxmap_resize(new_entries_map, new_length_hint)) < 0)
-		goto done;
+	if (index->ignore_case && new_length_hint)
+		git_idxmap_icase_resize((git_idxmap_icase *) new_entries_map, new_length_hint);
+	else if (new_length_hint)
+		git_idxmap_resize(new_entries_map, new_length_hint);
 
 	opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE |
 		GIT_ITERATOR_INCLUDE_CONFLICTS;
@@ -3265,7 +3251,7 @@ static int git_index_read_iterator(
 
 		if (add_entry) {
 			if ((error = git_vector_insert(&new_entries, add_entry)) == 0)
-				INSERT_IN_MAP_EX(index, new_entries_map, add_entry, error);
+				INSERT_IN_MAP_EX(index, new_entries_map, add_entry, &error);
 		}
 
 		if (remove_entry && error >= 0)
@@ -3714,12 +3700,3 @@ void git_indexwriter_cleanup(git_indexwriter *writer)
 	git_index_free(writer->index);
 	writer->index = NULL;
 }
-
-/* Deprecated functions */
-
-int git_index_add_frombuffer(
-    git_index *index, const git_index_entry *source_entry,
-    const void *buffer, size_t len)
-{
-	return git_index_add_from_buffer(index, source_entry, buffer, len);
-}

data/vendor/libgit2/src/index.h

@@ -9,7 +9,7 @@
 
 #include "common.h"
 
-#include "futils.h"
+#include "fileops.h"
 #include "filebuf.h"
 #include "vector.h"
 #include "idxmap.h"

data/vendor/libgit2/src/indexer.c

@@ -19,7 +19,6 @@
 #include "pack.h"
 #include "filebuf.h"
 #include "oid.h"
-#include "oidarray.h"
 #include "oidmap.h"
 #include "zstream.h"
 #include "object.h"
@@ -47,8 +46,8 @@ struct git_indexer {
 	struct git_pack_header hdr;
 	struct git_pack_file *pack;
 	unsigned int mode;
-	off64_t off;
-	off64_t entry_start;
+	git_off_t off;
+	git_off_t entry_start;
 	git_object_t entry_type;
 	git_buf entry_data;
 	git_packfile_stream stream;
@@ -58,7 +57,7 @@ struct git_indexer {
 	unsigned int fanout[256];
 	git_hash_ctx hash_ctx;
 	git_oid hash;
-	git_indexer_progress_cb progress_cb;
+	git_transfer_progress_cb progress_cb;
 	void *progress_payload;
 	char objbuf[8*1024];
 
@@ -75,7 +74,7 @@ struct git_indexer {
 };
 
 struct delta_info {
-	off64_t delta_off;
+	git_off_t delta_off;
 };
 
 const git_oid *git_indexer_hash(const git_indexer *idx)
@@ -116,18 +115,13 @@ static int objects_cmp(const void *a, const void *b)
 	return git_oid__cmp(&entrya->oid, &entryb->oid);
 }
 
-int git_indexer_options_init(git_indexer_options *opts, unsigned int version)
+int git_indexer_init_options(git_indexer_options *opts, unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
 		opts, version, git_indexer_options, GIT_INDEXER_OPTIONS_INIT);
 	return 0;
 }
 
-int git_indexer_init_options(git_indexer_options *opts, unsigned int version)
-{
-	return git_indexer_options_init(opts, version);
-}
-
 int git_indexer_new(
 		git_indexer **out,
 		const char *prefix,
@@ -153,9 +147,8 @@ int git_indexer_new(
 	git_hash_ctx_init(&idx->hash_ctx);
 	git_hash_ctx_init(&idx->trailer);
 	git_buf_init(&idx->entry_data, 0);
-
-	if ((error = git_oidmap_new(&idx->expected_oids)) < 0)
-		goto cleanup;
+	idx->expected_oids = git_oidmap_alloc();
+	GIT_ERROR_CHECK_ALLOC(idx->expected_oids);
 
 	idx->do_verify = opts.verify;
 
@@ -220,7 +213,7 @@ static int store_delta(git_indexer *idx)
 	return 0;
 }
 
-static int hash_header(git_hash_ctx *ctx, off64_t len, git_object_t type)
+static int hash_header(git_hash_ctx *ctx, git_off_t len, git_object_t type)
 {
 	char buffer[64];
 	size_t hdrlen;
@@ -265,7 +258,7 @@ static int advance_delta_offset(git_indexer *idx, git_object_t type)
 	if (type == GIT_OBJECT_REF_DELTA) {
 		idx->off += GIT_OID_RAWSZ;
 	} else {
-		off64_t base_off = get_delta_base(idx->pack, &w, &idx->off, type, idx->entry_start);
+		git_off_t base_off = get_delta_base(idx->pack, &w, &idx->off, type, idx->entry_start);
 		git_mwindow_close(&w);
 		if (base_off < 0)
 			return (int)base_off;
@@ -291,7 +284,7 @@ static int read_object_stream(git_indexer *idx, git_packfile_stream *stream)
 	return 0;
 }
 
-static int crc_object(uint32_t *crc_out, git_mwindow_file *mwf, off64_t start, off64_t size)
+static int crc_object(uint32_t *crc_out, git_mwindow_file *mwf, git_off_t start, git_off_t size)
 {
 	void *ptr;
 	uint32_t crc;
@@ -315,8 +308,10 @@ static int crc_object(uint32_t *crc_out, git_mwindow_file *mwf, off64_t start, o
 	return 0;
 }
 
-static int add_expected_oid(git_indexer *idx, const git_oid *oid)
+static void add_expected_oid(git_indexer *idx, const git_oid *oid)
 {
+	int ret;
+
 	/*
 	 * If we know about that object because it is stored in our ODB or
 	 * because we have already processed it as part of our pack file, we do
@@ -326,18 +321,15 @@ static int add_expected_oid(git_indexer *idx, const git_oid *oid)
 	    !git_oidmap_exists(idx->pack->idx_cache, oid) &&
 	    !git_oidmap_exists(idx->expected_oids, oid)) {
 		    git_oid *dup = git__malloc(sizeof(*oid));
-		    GIT_ERROR_CHECK_ALLOC(dup);
 		    git_oid_cpy(dup, oid);
-		    return git_oidmap_set(idx->expected_oids, dup, dup);
+		    git_oidmap_put(idx->expected_oids, dup, &ret);
 	}
-
-	return 0;
 }
 
 static int check_object_connectivity(git_indexer *idx, const git_rawobj *obj)
 {
 	git_object *object;
-	git_oid *expected;
+	size_t keyidx;
 	int error;
 
 	if (obj->type != GIT_OBJECT_BLOB &&
@@ -349,9 +341,11 @@ static int check_object_connectivity(git_indexer *idx, const git_rawobj *obj)
 	if ((error = git_object__from_raw(&object, obj->data, obj->len, obj->type)) < 0)
 		goto out;
 
-	if ((expected = git_oidmap_get(idx->expected_oids, &object->cached.oid)) != NULL) {
-		git_oidmap_delete(idx->expected_oids, &object->cached.oid);
-		git__free(expected);
+	keyidx = git_oidmap_lookup_index(idx->expected_oids, &object->cached.oid);
+	if (git_oidmap_valid_index(idx->expected_oids, keyidx)) {
+		const git_oid *key = git_oidmap_key(idx->expected_oids, keyidx);
+		git__free((git_oid *) key);
+		git_oidmap_delete_at(idx->expected_oids, keyidx);
 	}
 
 	/*
@@ -369,8 +363,7 @@ static int check_object_connectivity(git_indexer *idx, const git_rawobj *obj)
 			size_t i;
 
 			git_array_foreach(tree->entries, i, entry)
-				if (add_expected_oid(idx, entry->oid) < 0)
-					goto out;
+				add_expected_oid(idx, entry->oid);
 
 			break;
 		}
@@ -381,11 +374,9 @@ static int check_object_connectivity(git_indexer *idx, const git_rawobj *obj)
 			size_t i;
 
 			git_array_foreach(commit->parent_ids, i, parent_oid)
-				if (add_expected_oid(idx, parent_oid) < 0)
-					goto out;
+				add_expected_oid(idx, parent_oid);
 
-			if (add_expected_oid(idx, &commit->tree_id) < 0)
-				goto out;
+			add_expected_oid(idx, &commit->tree_id);
 
 			break;
 		}
@@ -393,8 +384,7 @@ static int check_object_connectivity(git_indexer *idx, const git_rawobj *obj)
 		{
 			git_tag *tag = (git_tag *) object;
 
-			if (add_expected_oid(idx, &tag->target) < 0)
-				goto out;
+			add_expected_oid(idx, &tag->target);
 
 			break;
 		}
@@ -412,11 +402,12 @@ out:
 static int store_object(git_indexer *idx)
 {
 	int i, error;
+	size_t k;
 	git_oid oid;
 	struct entry *entry;
-	off64_t entry_size;
+	git_off_t entry_size;
 	struct git_pack_entry *pentry;
-	off64_t entry_start = idx->entry_start;
+	git_off_t entry_start = idx->entry_start;
 
 	entry = git__calloc(1, sizeof(*entry));
 	GIT_ERROR_CHECK_ALLOC(entry);
@@ -447,18 +438,22 @@ static int store_object(git_indexer *idx)
 	git_oid_cpy(&pentry->sha1, &oid);
 	pentry->offset = entry_start;
 
-	if (git_oidmap_exists(idx->pack->idx_cache, &pentry->sha1)) {
-		git_error_set(GIT_ERROR_INDEXER, "duplicate object %s found in pack", git_oid_tostr_s(&pentry->sha1));
+	k = git_oidmap_put(idx->pack->idx_cache, &pentry->sha1, &error);
+	if (error == -1) {
 		git__free(pentry);
+		git_error_set_oom();
 		goto on_error;
 	}
 
-	if ((error = git_oidmap_set(idx->pack->idx_cache, &pentry->sha1, pentry)) < 0) {
+	if (error == 0) {
+		git_error_set(GIT_ERROR_INDEXER, "duplicate object %s found in pack", git_oid_tostr_s(&pentry->sha1));
 		git__free(pentry);
-		git_error_set_oom();
 		goto on_error;
 	}
 
+
+	git_oidmap_set_value_at(idx->pack->idx_cache, k, pentry);
+
 	git_oid_cpy(&entry->oid, &oid);
 
 	if (crc_object(&entry->crc, &idx->pack->mwf, entry_start, entry_size) < 0)
@@ -485,9 +480,10 @@ GIT_INLINE(bool) has_entry(git_indexer *idx, git_oid *id)
 	return git_oidmap_exists(idx->pack->idx_cache, id);
 }
 
-static int save_entry(git_indexer *idx, struct entry *entry, struct git_pack_entry *pentry, off64_t entry_start)
+static int save_entry(git_indexer *idx, struct entry *entry, struct git_pack_entry *pentry, git_off_t entry_start)
 {
-	int i;
+	int i, error;
+	size_t k;
 
 	if (entry_start > UINT31_MAX) {
 		entry->offset = UINT32_MAX;
@@ -497,13 +493,15 @@ static int save_entry(git_indexer *idx, struct entry *entry, struct git_pack_ent
 	}
 
 	pentry->offset = entry_start;
+	k = git_oidmap_put(idx->pack->idx_cache, &pentry->sha1, &error);
 
-	if (git_oidmap_exists(idx->pack->idx_cache, &pentry->sha1) ||
-	    git_oidmap_set(idx->pack->idx_cache, &pentry->sha1, pentry) < 0) {
+	if (error <= 0) {
 		git_error_set(GIT_ERROR_INDEXER, "cannot insert object into pack");
 		return -1;
 	}
 
+	git_oidmap_set_value_at(idx->pack->idx_cache, k, pentry);
+
 	/* Add the object to the list */
 	if (git_vector_insert(&idx->objects, entry) < 0)
 		return -1;
@@ -515,7 +513,7 @@ static int save_entry(git_indexer *idx, struct entry *entry, struct git_pack_ent
 	return 0;
 }
 
-static int hash_and_save(git_indexer *idx, git_rawobj *obj, off64_t entry_start)
+static int hash_and_save(git_indexer *idx, git_rawobj *obj, git_off_t entry_start)
 {
 	git_oid oid;
 	size_t entry_size;
@@ -550,7 +548,7 @@ on_error:
 	return -1;
 }
 
-static int do_progress_callback(git_indexer *idx, git_indexer_progress *stats)
+static int do_progress_callback(git_indexer *idx, git_transfer_progress *stats)
 {
 	if (idx->progress_cb)
 		return git_error_set_after_callback_function(
@@ -596,12 +594,12 @@ static void hash_partially(git_indexer *idx, const uint8_t *data, size_t size)
 	idx->inbuf_len += size - to_expell;
 }
 
-static int write_at(git_indexer *idx, const void *data, off64_t offset, size_t size)
+static int write_at(git_indexer *idx, const void *data, git_off_t offset, size_t size)
 {
 	git_file fd = idx->pack->mwf.fd;
 	size_t mmap_alignment;
 	size_t page_offset;
-	off64_t page_start;
+	git_off_t page_start;
 	unsigned char *map_data;
 	git_map map;
 	int error;
@@ -627,11 +625,11 @@ static int write_at(git_indexer *idx, const void *data, off64_t offset, size_t s
 
 static int append_to_pack(git_indexer *idx, const void *data, size_t size)
 {
-	off64_t new_size;
+	git_off_t new_size;
 	size_t mmap_alignment;
 	size_t page_offset;
-	off64_t page_start;
-	off64_t current_size = idx->pack->mwf.size;
+	git_off_t page_start;
+	git_off_t current_size = idx->pack->mwf.size;
 	int fd = idx->pack->mwf.fd;
 	int error;
 
@@ -658,10 +656,10 @@ static int append_to_pack(git_indexer *idx, const void *data, size_t size)
 	return write_at(idx, data, idx->pack->mwf.size, size);
 }
 
-static int read_stream_object(git_indexer *idx, git_indexer_progress *stats)
+static int read_stream_object(git_indexer *idx, git_transfer_progress *stats)
 {
 	git_packfile_stream *stream = &idx->stream;
-	off64_t entry_start = idx->off;
+	git_off_t entry_start = idx->off;
 	size_t entry_size;
 	git_object_t type;
 	git_mwindow *w = NULL;
@@ -747,7 +745,7 @@ static int read_stream_object(git_indexer *idx, git_indexer_progress *stats)
 	return 0;
 }
 
-int git_indexer_append(git_indexer *idx, const void *data, size_t size, git_indexer_progress *stats)
+int git_indexer_append(git_indexer *idx, const void *data, size_t size, git_transfer_progress *stats)
 {
 	int error = -1;
 	struct git_pack_header *hdr = &idx->hdr;
@@ -783,8 +781,8 @@ int git_indexer_append(git_indexer *idx, const void *data, size_t size, git_inde
 			return -1;
 		}
 
-		if (git_oidmap_new(&idx->pack->idx_cache) < 0)
-			return -1;
+		idx->pack->idx_cache = git_oidmap_alloc();
+		GIT_ERROR_CHECK_ALLOC(idx->pack->idx_cache);
 
 		idx->pack->has_cache = 1;
 		if (git_vector_init(&idx->objects, total_objects, objects_cmp) < 0)
@@ -865,7 +863,7 @@ static int inject_object(git_indexer *idx, git_oid *id)
 	git_oid foo = {{0}};
 	unsigned char hdr[64];
 	git_buf buf = GIT_BUF_INIT;
-	off64_t entry_start;
+	git_off_t entry_start;
 	const void *data;
 	size_t len, hdr_len;
 	int error;
@@ -931,7 +929,7 @@ cleanup:
 	return error;
 }
 
-static int fix_thin_pack(git_indexer *idx, git_indexer_progress *stats)
+static int fix_thin_pack(git_indexer *idx, git_transfer_progress *stats)
 {
 	int error, found_ref_delta = 0;
 	unsigned int i;
@@ -939,7 +937,7 @@ static int fix_thin_pack(git_indexer *idx, git_indexer_progress *stats)
 	size_t size;
 	git_object_t type;
 	git_mwindow *w = NULL;
-	off64_t curpos = 0;
+	git_off_t curpos = 0;
 	unsigned char *base_info;
 	unsigned int left = 0;
 	git_oid base;
@@ -993,7 +991,7 @@ static int fix_thin_pack(git_indexer *idx, git_indexer_progress *stats)
 	return 0;
 }
 
-static int resolve_deltas(git_indexer *idx, git_indexer_progress *stats)
+static int resolve_deltas(git_indexer *idx, git_transfer_progress *stats)
 {
 	unsigned int i;
 	int error;
@@ -1050,11 +1048,11 @@ static int resolve_deltas(git_indexer *idx, git_indexer_progress *stats)
 	return 0;
 }
 
-static int update_header_and_rehash(git_indexer *idx, git_indexer_progress *stats)
+static int update_header_and_rehash(git_indexer *idx, git_transfer_progress *stats)
 {
 	void *ptr;
 	size_t chunk = 1024*1024;
-	off64_t hashed = 0;
+	git_off_t hashed = 0;
 	git_mwindow *w = NULL;
 	git_mwindow_file *mwf;
 	unsigned int left;
@@ -1091,7 +1089,7 @@ static int update_header_and_rehash(git_indexer *idx, git_indexer_progress *stat
 	return 0;
 }
 
-int git_indexer_commit(git_indexer *idx, git_indexer_progress *stats)
+int git_indexer_commit(git_indexer *idx, git_transfer_progress *stats)
 {
 	git_mwindow *w = NULL;
 	unsigned int i, long_offsets = 0, left;
@@ -1294,9 +1292,7 @@ on_error:
 
 void git_indexer_free(git_indexer *idx)
 {
-	const git_oid *key;
-	git_oid *value;
-	size_t iter;
+	size_t pos;
 
 	if (idx == NULL)
 		return;
@@ -1325,9 +1321,14 @@ void git_indexer_free(git_indexer *idx)
 		git_mutex_unlock(&git__mwindow_mutex);
 	}
 
-	iter = 0;
-	while (git_oidmap_iterate((void **) &value, idx->expected_oids, &iter, &key) == 0)
-		git__free(value);
+	for (pos = git_oidmap_begin(idx->expected_oids);
+	    pos != git_oidmap_end(idx->expected_oids); pos++)
+	{
+		if (git_oidmap_has_data(idx->expected_oids, pos)) {
+			git__free((git_oid *) git_oidmap_key(idx->expected_oids, pos));
+			git_oidmap_delete_at(idx->expected_oids, pos);
+		}
+	}
 
 	git_hash_ctx_cleanup(&idx->trailer);
 	git_hash_ctx_cleanup(&idx->hash_ctx);