rugged 1.7.2 → 1.9.0

data/vendor/libgit2/src/libgit2/email.c

@@ -16,6 +16,7 @@
 
 #include "git2/email.h"
 #include "git2/patch.h"
+#include "git2/sys/email.h"
 #include "git2/version.h"
 
 /*

data/vendor/libgit2/src/libgit2/fetch.c

@@ -60,9 +60,11 @@ static int mark_local(git_remote *remote)
 
 	git_vector_foreach(&remote->refs, i, head) {
 		/* If we have the object, mark it so we don't ask for it.
-		   However if we are unshallowing, we need to ask for it
-		   even though the head exists locally. */
-		if (remote->nego.depth != INT_MAX && git_odb_exists(odb, &head->oid))
+		   However if we are unshallowing or changing history
+		   depth, we need to ask for it even though the head
+		   exists locally. */
+		if (remote->nego.depth == GIT_FETCH_DEPTH_FULL &&
+		    git_odb_exists(odb, &head->oid))
 			head->local = 1;
 		else
 			remote->need_pack = 1;

data/vendor/libgit2/src/libgit2/filter.c

@@ -239,7 +239,7 @@ static void git_filter_global_shutdown(void)
 		git__free(fdef);
 	}
 
-	git_vector_free(&filter_registry.filters);
+	git_vector_dispose(&filter_registry.filters);
 
 	git_rwlock_wrunlock(&filter_registry.lock);
 	git_rwlock_free(&filter_registry.lock);
@@ -908,7 +908,7 @@ static int buffered_stream_close(git_writestream *s)
 {
 	struct buffered_stream *buffered_stream = (struct buffered_stream *)s;
 	git_str *writebuf;
-	git_error_state error_state = {0};
+	git_error *last_error;
 	int error;
 
 	GIT_ASSERT_ARG(buffered_stream);
@@ -946,9 +946,9 @@ static int buffered_stream_close(git_writestream *s)
 	} else {
 		/* close stream before erroring out taking care
 		 * to preserve the original error */
-		git_error_state_capture(&error_state, error);
+		git_error_save(&last_error);
 		buffered_stream->target->close(buffered_stream->target);
-		git_error_state_restore(&error_state);
+		git_error_restore(last_error);
 		return error;
 	}
 
@@ -1106,7 +1106,7 @@ static void filter_streams_free(git_vector *streams)
 
 	git_vector_foreach(streams, i, stream)
 		stream->free(stream);
-	git_vector_free(streams);
+	git_vector_dispose(streams);
 }
 
 int git_filter_list_stream_file(

data/vendor/libgit2/src/libgit2/git2.rc

@@ -10,7 +10,7 @@
 #endif
 
 #ifndef LIBGIT2_COMMENTS
-# define LIBGIT2_COMMENTS "For more information visit http://libgit2.github.com/"
+# define LIBGIT2_COMMENTS "For more information visit https://libgit2.org/"
 #endif
 
 #ifdef __GNUC__
@@ -25,8 +25,8 @@ VS_VERSION_INFO		VERSIONINFO
 #else
 VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
 #endif
-  FILEVERSION		LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,LIBGIT2_VER_PATCH
-  PRODUCTVERSION	LIBGIT2_VER_MAJOR,LIBGIT2_VER_MINOR,LIBGIT2_VER_REVISION,LIBGIT2_VER_PATCH
+  FILEVERSION		LIBGIT2_VERSION_MAJOR,LIBGIT2_VERSION_MINOR,LIBGIT2_VERSION_REVISION,LIBGIT2_VERSION_PATCH
+  PRODUCTVERSION	LIBGIT2_VERSION_MAJOR,LIBGIT2_VERSION_MINOR,LIBGIT2_VERSION_REVISION,LIBGIT2_VERSION_PATCH
   FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
   FILEFLAGS		VS_FF_DEBUG

data/vendor/libgit2/src/libgit2/grafts.c

@@ -11,10 +11,13 @@
 #include "oid.h"
 #include "oidarray.h"
 #include "parse.h"
+#include "hashmap_oid.h"
+
+GIT_HASHMAP_OID_SETUP(git_grafts_oidmap, git_commit_graft *);
 
 struct git_grafts {
 	/* Map of `git_commit_graft`s */
-	git_oidmap *commits;
+	git_grafts_oidmap commits;
 
 	/* Type of object IDs */
 	git_oid_t oid_type;
@@ -33,11 +36,6 @@ int git_grafts_new(git_grafts **out, git_oid_t oid_type)
 	grafts = git__calloc(1, sizeof(*grafts));
 	GIT_ERROR_CHECK_ALLOC(grafts);
 
-	if ((git_oidmap_new(&grafts->commits)) < 0) {
-		git__free(grafts);
-		return -1;
-	}
-
 	grafts->oid_type = oid_type;
 
 	*out = grafts;
@@ -88,23 +86,24 @@ void git_grafts_free(git_grafts *grafts)
 		return;
 	git__free(grafts->path);
 	git_grafts_clear(grafts);
-	git_oidmap_free(grafts->commits);
+	git_grafts_oidmap_dispose(&grafts->commits);
 	git__free(grafts);
 }
 
 void git_grafts_clear(git_grafts *grafts)
 {
+	git_hashmap_iter_t iter = GIT_HASHMAP_ITER_INIT;
 	git_commit_graft *graft;
 
 	if (!grafts)
 		return;
 
-	git_oidmap_foreach_value(grafts->commits, graft, {
+	while (git_grafts_oidmap_iterate(&iter, NULL, &graft, &grafts->commits) == 0) {
 		git__free(graft->parents.ptr);
 		git__free(graft);
-	});
+	}
 
-	git_oidmap_clear(grafts->commits);
+	git_grafts_oidmap_clear(&grafts->commits);
 }
 
 int git_grafts_refresh(git_grafts *grafts)
@@ -205,7 +204,7 @@ int git_grafts_add(git_grafts *grafts, const git_oid *oid, git_array_oid_t paren
 	if ((error = git_grafts_remove(grafts, &graft->oid)) < 0 && error != GIT_ENOTFOUND)
 		goto cleanup;
 
-	if ((error = git_oidmap_set(grafts->commits, &graft->oid, graft)) < 0)
+	if ((error = git_grafts_oidmap_put(&grafts->commits, &graft->oid, graft)) < 0)
 		goto cleanup;
 
 	return 0;
@@ -223,10 +222,10 @@ int git_grafts_remove(git_grafts *grafts, const git_oid *oid)
 
 	GIT_ASSERT_ARG(grafts && oid);
 
-	if ((graft = git_oidmap_get(grafts->commits, oid)) == NULL)
+	if (git_grafts_oidmap_get(&graft, &grafts->commits, oid) != 0)
 		return GIT_ENOTFOUND;
 
-	if ((error = git_oidmap_delete(grafts->commits, oid)) < 0)
+	if ((error = git_grafts_oidmap_remove(&grafts->commits, oid)) < 0)
 		return error;
 
 	git__free(graft->parents.ptr);
@@ -238,23 +237,22 @@ int git_grafts_remove(git_grafts *grafts, const git_oid *oid)
 int git_grafts_get(git_commit_graft **out, git_grafts *grafts, const git_oid *oid)
 {
 	GIT_ASSERT_ARG(out && grafts && oid);
-	if ((*out = git_oidmap_get(grafts->commits, oid)) == NULL)
-		return GIT_ENOTFOUND;
-	return 0;
+	return git_grafts_oidmap_get(out, &grafts->commits, oid);
 }
 
 int git_grafts_oids(git_oid **out, size_t *out_len, git_grafts *grafts)
 {
+	git_hashmap_iter_t iter = GIT_HASHMAP_ITER_INIT;
 	git_array_oid_t array = GIT_ARRAY_INIT;
 	const git_oid *oid;
-	size_t existing, i = 0;
+	size_t existing;
 
 	GIT_ASSERT_ARG(out && grafts);
 
-	if ((existing = git_oidmap_size(grafts->commits)) > 0)
+	if ((existing = git_grafts_oidmap_size(&grafts->commits)) > 0)
 		git_array_init_to_size(array, existing);
 
-	while (git_oidmap_iterate(NULL, grafts->commits, &i, &oid) == 0) {
+	while (git_grafts_oidmap_iterate(&iter, &oid, NULL, &grafts->commits) == 0) {
 		git_oid *cpy = git_array_alloc(array);
 		GIT_ERROR_CHECK_ALLOC(cpy);
 		git_oid_cpy(cpy, oid);
@@ -268,5 +266,5 @@ int git_grafts_oids(git_oid **out, size_t *out_len, git_grafts *grafts)
 
 size_t git_grafts_size(git_grafts *grafts)
 {
-	return git_oidmap_size(grafts->commits);
+	return git_grafts_oidmap_size(&grafts->commits);
 }

data/vendor/libgit2/src/libgit2/grafts.h

@@ -9,7 +9,6 @@
 
 #include "common.h"
 #include "oidarray.h"
-#include "oidmap.h"
 
 /** graft commit */
 typedef struct {

data/vendor/libgit2/src/libgit2/graph.c

@@ -243,7 +243,7 @@ int git_graph_reachable_from_any(
 
 done:
 	git_commit_list_free(&result);
-	git_vector_free(&list);
+	git_vector_dispose(&list);
 	git_revwalk_free(walk);
 	return error;
 }

data/vendor/libgit2/src/libgit2/hashmap_oid.h

@@ -0,0 +1,30 @@
+/*
+ * 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_hashmap_oid_h__
+#define INCLUDE_hashmap_oid_h__
+
+#include "hashmap.h"
+
+GIT_INLINE(uint32_t) git_hashmap_oid_hashcode(const git_oid *oid)
+{
+	uint32_t hash;
+	memcpy(&hash, oid->id, sizeof(uint32_t));
+	return hash;
+}
+
+#define GIT_HASHMAP_OID_STRUCT(name, val_t) \
+	GIT_HASHMAP_STRUCT(name, const git_oid *, val_t)
+#define GIT_HASHMAP_OID_PROTOTYPES(name, val_t) \
+	GIT_HASHMAP_PROTOTYPES(name, const git_oid *, val_t)
+#define GIT_HASHMAP_OID_FUNCTIONS(name, scope, val_t) \
+	GIT_HASHMAP_FUNCTIONS(name, scope, const git_oid *, val_t, git_hashmap_oid_hashcode, git_oid_equal)
+
+#define GIT_HASHMAP_OID_SETUP(name, val_t) \
+	GIT_HASHMAP_OID_STRUCT(name, val_t) \
+	GIT_HASHMAP_OID_FUNCTIONS(name, GIT_HASHMAP_INLINE, val_t)
+
+#endif

data/vendor/libgit2/src/libgit2/ignore.c

@@ -296,6 +296,8 @@ int git_ignore__for_path(
 {
 	int error = 0;
 	const char *workdir = git_repository_workdir(repo);
+	git_attr_cache *attrcache;
+	const char *excludes_file = NULL;
 	git_str infopath = GIT_STR_INIT;
 
 	GIT_ASSERT_ARG(repo);
@@ -358,10 +360,12 @@ int git_ignore__for_path(
 	}
 
 	/* load core.excludesfile */
-	if (git_repository_attr_cache(repo)->cfg_excl_file != NULL)
+	attrcache = git_repository_attr_cache(repo);
+	excludes_file = git_attr_cache_excludesfile(attrcache);
+
+	if (excludes_file != NULL)
 		error = push_ignore_file(
-			ignores, &ignores->ign_global, NULL,
-			git_repository_attr_cache(repo)->cfg_excl_file);
+			ignores, &ignores->ign_global, NULL, excludes_file);
 
 cleanup:
 	git_str_dispose(&infopath);
@@ -428,13 +432,13 @@ void git_ignore__free(git_ignores *ignores)
 		git_attr_file__free(file);
 		ignores->ign_path.contents[i] = NULL;
 	}
-	git_vector_free(&ignores->ign_path);
+	git_vector_dispose(&ignores->ign_path);
 
 	git_vector_foreach(&ignores->ign_global, i, file) {
 		git_attr_file__free(file);
 		ignores->ign_global.contents[i] = NULL;
 	}
-	git_vector_free(&ignores->ign_global);
+	git_vector_dispose(&ignores->ign_global);
 
 	git_str_dispose(&ignores->dir);
 }

data/vendor/libgit2/src/libgit2/index.c

@@ -17,10 +17,10 @@
 #include "pathspec.h"
 #include "ignore.h"
 #include "blob.h"
-#include "idxmap.h"
 #include "diff.h"
 #include "varint.h"
 #include "path.h"
+#include "index_map.h"
 
 #include "git2/odb.h"
 #include "git2/oid.h"
@@ -133,30 +133,6 @@ static int write_index(unsigned char checksum[GIT_HASH_MAX_SIZE], size_t *checks
 static void index_entry_free(git_index_entry *entry);
 static void index_entry_reuc_free(git_index_reuc_entry *reuc);
 
-GIT_INLINE(int) index_map_set(git_idxmap *map, git_index_entry *e, bool ignore_case)
-{
-	if (ignore_case)
-		return git_idxmap_icase_set((git_idxmap_icase *) map, e, e);
-	else
-		return git_idxmap_set(map, e, e);
-}
-
-GIT_INLINE(int) index_map_delete(git_idxmap *map, git_index_entry *e, bool ignore_case)
-{
-	if (ignore_case)
-		return git_idxmap_icase_delete((git_idxmap_icase *) map, e);
-	else
-		return git_idxmap_delete(map, e);
-}
-
-GIT_INLINE(int) index_map_resize(git_idxmap *map, size_t count, bool ignore_case)
-{
-	if (ignore_case)
-		return git_idxmap_icase_resize((git_idxmap_icase *) map, count);
-	else
-		return git_idxmap_resize(map, count);
-}
-
 int git_index_entry_srch(const void *key, const void *array_member)
 {
 	const struct entry_srch_key *srch_key = key;
@@ -388,6 +364,7 @@ GIT_INLINE(int) index_find(
 void git_index__set_ignore_case(git_index *index, bool ignore_case)
 {
 	index->ignore_case = ignore_case;
+	index->entries_map.ignore_case = ignore_case;
 
 	if (ignore_case) {
 		index->entries_cmp_path    = git__strcasecmp_cb;
@@ -422,6 +399,7 @@ int git_index__open(
 	index = git__calloc(1, sizeof(git_index));
 	GIT_ERROR_CHECK_ALLOC(index);
 
+	GIT_ASSERT_ARG(git_oid_type_is_valid(oid_type));
 	index->oid_type = oid_type;
 
 	if (git_pool_init(&index->tree_pool, 1) < 0)
@@ -438,7 +416,6 @@ int git_index__open(
 	}
 
 	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)
@@ -465,9 +442,13 @@ fail:
 }
 
 #ifdef GIT_EXPERIMENTAL_SHA256
-int git_index_open(git_index **index_out, const char *index_path, git_oid_t oid_type)
+int git_index_open(
+	git_index **index_out,
+	const char *index_path,
+	const git_index_options *opts)
 {
-	return git_index__open(index_out, index_path, oid_type);
+	return git_index__open(index_out, index_path,
+		opts && opts->oid_type ? opts->oid_type : GIT_OID_DEFAULT);
 }
 #else
 int git_index_open(git_index **index_out, const char *index_path)
@@ -482,9 +463,10 @@ int git_index__new(git_index **out, git_oid_t oid_type)
 }
 
 #ifdef GIT_EXPERIMENTAL_SHA256
-int git_index_new(git_index **out, git_oid_t oid_type)
+int git_index_new(git_index **out, const git_index_options *opts)
 {
-	return git_index__new(out, oid_type);
+	return git_index__new(out,
+		opts && opts->oid_type ? opts->oid_type : GIT_OID_DEFAULT);
 }
 #else
 int git_index_new(git_index **out)
@@ -502,11 +484,11 @@ static void index_free(git_index *index)
 		return;
 
 	git_index_clear(index);
-	git_idxmap_free(index->entries_map);
-	git_vector_free(&index->entries);
-	git_vector_free(&index->names);
-	git_vector_free(&index->reuc);
-	git_vector_free(&index->deleted);
+	git_index_entrymap_dispose(&index->entries_map);
+	git_vector_dispose(&index->entries);
+	git_vector_dispose(&index->names);
+	git_vector_dispose(&index->reuc);
+	git_vector_dispose(&index->deleted);
 
 	git__free(index->index_file_path);
 
@@ -547,7 +529,7 @@ static int index_remove_entry(git_index *index, size_t pos)
 
 	if (entry != NULL) {
 		git_tree_cache_invalidate_path(index->tree, entry->path);
-		index_map_delete(index->entries_map, entry, index->ignore_case);
+		git_index_entrymap_remove(&index->entries_map, entry);
 	}
 
 	error = git_vector_remove(&index->entries, pos);
@@ -575,7 +557,8 @@ int git_index_clear(git_index *index)
 	index->tree = NULL;
 	git_pool_clear(&index->tree_pool);
 
-	git_idxmap_clear(index->entries_map);
+	git_index_entrymap_clear(&index->entries_map);
+
 	while (!error && index->entries.length > 0)
 		error = index_remove_entry(index, index->entries.length - 1);
 
@@ -786,8 +769,10 @@ static int truncate_racily_clean(git_index *index)
 	diff_opts.pathspec.count = paths.length;
 	diff_opts.pathspec.strings = (char **)paths.contents;
 
-	if ((error = git_diff_index_to_workdir(&diff, INDEX_OWNER(index), index, &diff_opts)) < 0)
+	if ((error = git_diff_index_to_workdir(&diff, INDEX_OWNER(index), index, &diff_opts)) < 0) {
+		git_vector_dispose(&paths);
 		return error;
+	}
 
 	git_vector_foreach(&diff->deltas, i, delta) {
 		entry = (git_index_entry *)git_index_get_bypath(index, delta->old_file.path, 0);
@@ -803,7 +788,7 @@ static int truncate_racily_clean(git_index *index)
 
 done:
 	git_diff_free(diff);
-	git_vector_free(&paths);
+	git_vector_dispose(&paths);
 	return 0;
 }
 
@@ -904,14 +889,9 @@ const git_index_entry *git_index_get_bypath(
 	key.path = path;
 	GIT_INDEX_ENTRY_STAGE_SET(&key, stage);
 
-	if (index->ignore_case)
-		value = git_idxmap_icase_get((git_idxmap_icase *) index->entries_map, &key);
-	else
-		value = git_idxmap_get(index->entries_map, &key);
-
-	if (!value) {
-	    git_error_set(GIT_ERROR_INDEX, "index does not contain '%s'", path);
-	    return NULL;
+	if (git_index_entrymap_get(&value, &index->entries_map, &key) != 0) {
+		git_error_set(GIT_ERROR_INDEX, "index does not contain '%s'", path);
+		return NULL;
 	}
 
 	return value;
@@ -1453,7 +1433,7 @@ static int index_insert(
 		 * check for dups, this is actually cheaper in the long run.)
 		 */
 		if ((error = git_vector_insert_sorted(&index->entries, entry, index_no_dups)) < 0 ||
-		    (error = index_map_set(index->entries_map, entry, index->ignore_case)) < 0)
+		    (error = git_index_entrymap_put(&index->entries_map, entry)) < 0)
 			goto out;
 	}
 
@@ -1612,15 +1592,17 @@ int git_index_add_bypath(git_index *index, const char *path)
 
 	if (ret == GIT_EDIRECTORY) {
 		git_submodule *sm;
-		git_error_state err;
+		git_error *last_error;
 
-		git_error_state_capture(&err, ret);
+		git_error_save(&last_error);
 
 		ret = git_submodule_lookup(&sm, INDEX_OWNER(index), path);
-		if (ret == GIT_ENOTFOUND)
-			return git_error_state_restore(&err);
+		if (ret == GIT_ENOTFOUND) {
+			git_error_restore(last_error);
+			return GIT_EDIRECTORY;
+		}
 
-		git_error_state_free(&err);
+		git_error_free(last_error);
 
 		/*
 		 * EEXISTS means that there is a repository at that path, but it's not known
@@ -1680,8 +1662,7 @@ int git_index__fill(git_index *index, const git_vector *source_entries)
 		return 0;
 
 	if (git_vector_size_hint(&index->entries, source_entries->length) < 0 ||
-	    index_map_resize(index->entries_map, (size_t)(source_entries->length * 1.3),
-			     index->ignore_case) < 0)
+	    git_index_entrymap_resize(&index->entries_map, (size_t)(source_entries->length * 1.3)) < 0)
 		return -1;
 
 	git_vector_foreach(source_entries, i, source_entry) {
@@ -1694,10 +1675,8 @@ int git_index__fill(git_index *index, const git_vector *source_entries)
 		entry->flags_extended |= GIT_INDEX_ENTRY_UPTODATE;
 		entry->mode = git_index__create_mode(entry->mode);
 
-		if ((error = git_vector_insert(&index->entries, entry)) < 0)
-			break;
-
-		if ((error = index_map_set(index->entries_map, entry, index->ignore_case)) < 0)
+		if ((error = git_vector_insert(&index->entries, entry)) < 0 ||
+		    (error = git_index_entrymap_put(&index->entries_map, entry)) < 0)
 			break;
 
 		index->dirty = 1;
@@ -1740,7 +1719,7 @@ int git_index_remove(git_index *index, const char *path, int stage)
 	remove_key.path = path;
 	GIT_INDEX_ENTRY_STAGE_SET(&remove_key, stage);
 
-	index_map_delete(index->entries_map, &remove_key, index->ignore_case);
+	git_index_entrymap_remove(&index->entries_map, &remove_key);
 
 	if (index_find(&position, index, path, 0, stage) < 0) {
 		git_error_set(
@@ -2758,6 +2737,7 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size)
 	unsigned int i;
 	struct index_header header = { 0 };
 	unsigned char checksum[GIT_HASH_MAX_SIZE];
+	unsigned char zero_checksum[GIT_HASH_MAX_SIZE] = { 0 };
 	size_t checksum_size = git_hash_size(git_oid_algorithm(index->oid_type));
 	const char *last = NULL;
 	const char *empty = "";
@@ -2792,7 +2772,7 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size)
 
 	GIT_ASSERT(!index->entries.length);
 
-	if ((error = index_map_resize(index->entries_map, header.entry_count, index->ignore_case)) < 0)
+	if ((error = git_index_entrymap_resize(&index->entries_map, header.entry_count)) < 0)
 		return error;
 
 	/* Parse all the entries */
@@ -2810,7 +2790,7 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size)
 			goto done;
 		}
 
-		if ((error = index_map_set(index->entries_map, entry, index->ignore_case)) < 0) {
+		if ((error = git_index_entrymap_put(&index->entries_map, entry)) < 0) {
 			index_entry_free(entry);
 			goto done;
 		}
@@ -2847,8 +2827,11 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size)
 	/*
 	 * SHA-1 or SHA-256 (depending on the repository's object format)
 	 * over the content of the index file before this checksum.
+	 * Note: checksum may be 0 if the index was written by a client
+	 * where index.skipHash was set to true.
 	 */
-	if (memcmp(checksum, buffer, checksum_size) != 0) {
+	if (memcmp(zero_checksum, buffer, checksum_size) != 0 &&
+	    memcmp(checksum, buffer, checksum_size) != 0) {
 		error = index_error_invalid(
 			"calculated checksum does not match expected");
 		goto done;
@@ -3083,7 +3066,7 @@ static int write_entries(git_index *index, git_filebuf *file)
 	}
 
 done:
-	git_vector_free(&case_sorted);
+	git_vector_dispose(&case_sorted);
 	return error;
 }
 
@@ -3359,14 +3342,11 @@ int git_index_read_tree(git_index *index, const git_tree *tree)
 {
 	int error = 0;
 	git_vector entries = GIT_VECTOR_INIT;
-	git_idxmap *entries_map;
+	git_index_entrymap entries_map = GIT_INDEX_ENTRYMAP_INIT;
 	read_tree_data data;
 	size_t i;
 	git_index_entry *e;
 
-	if (git_idxmap_new(&entries_map) < 0)
-		return -1;
-
 	git_vector_set_cmp(&entries, index->entries._cmp); /* match sort */
 
 	data.index = index;
@@ -3382,11 +3362,11 @@ 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 ((error = index_map_resize(entries_map, entries.length, index->ignore_case)) < 0)
+	if ((error = git_index_entrymap_resize(&entries_map, entries.length)) < 0)
 		goto cleanup;
 
 	git_vector_foreach(&entries, i, e) {
-		if ((error = index_map_set(entries_map, e, index->ignore_case)) < 0) {
+		if ((error = git_index_entrymap_put(&entries_map, e)) < 0) {
 			git_error_set(GIT_ERROR_INDEX, "failed to insert entry into map");
 			return error;
 		}
@@ -3396,18 +3376,18 @@ int git_index_read_tree(git_index *index, const git_tree *tree)
 
 	git_vector_sort(&entries);
 
-	if ((error = git_index_clear(index)) < 0) {
-		/* well, this isn't good */;
-	} else {
-		git_vector_swap(&entries, &index->entries);
-		entries_map = git_atomic_swap(index->entries_map, entries_map);
-	}
+	if ((error = git_index_clear(index)) < 0)
+		goto cleanup;
+
+	git_vector_swap(&entries, &index->entries);
+	git_index_entrymap_swap(&entries_map, &index->entries_map);
 
 	index->dirty = 1;
 
 cleanup:
-	git_vector_free(&entries);
-	git_idxmap_free(entries_map);
+	git_vector_dispose(&entries);
+	git_index_entrymap_dispose(&entries_map);
+
 	if (error < 0)
 		return error;
 
@@ -3423,7 +3403,7 @@ static int git_index_read_iterator(
 {
 	git_vector new_entries = GIT_VECTOR_INIT,
 		remove_entries = GIT_VECTOR_INIT;
-	git_idxmap *new_entries_map = NULL;
+	git_index_entrymap new_entries_map = GIT_INDEX_ENTRYMAP_INIT;
 	git_iterator *index_iterator = NULL;
 	git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT;
 	const git_index_entry *old_entry, *new_entry;
@@ -3434,12 +3414,11 @@ static int git_index_read_iterator(
 	GIT_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)
 		goto done;
 
-	if (new_length_hint && (error = index_map_resize(new_entries_map, new_length_hint,
-							 index->ignore_case)) < 0)
+	if (new_length_hint &&
+	    (error = git_index_entrymap_resize(&new_entries_map, new_length_hint)) < 0)
 		goto done;
 
 	opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE |
@@ -3504,8 +3483,7 @@ static int git_index_read_iterator(
 
 		if (add_entry) {
 			if ((error = git_vector_insert(&new_entries, add_entry)) == 0)
-				error = index_map_set(new_entries_map, add_entry,
-						      index->ignore_case);
+				error = git_index_entrymap_put(&new_entries_map, add_entry);
 		}
 
 		if (remove_entry && error >= 0)
@@ -3534,7 +3512,7 @@ static int git_index_read_iterator(
 	    goto done;
 
 	git_vector_swap(&new_entries, &index->entries);
-	new_entries_map = git_atomic_swap(index->entries_map, new_entries_map);
+	git_index_entrymap_swap(&index->entries_map, &new_entries_map);
 
 	git_vector_foreach(&remove_entries, i, entry) {
 		if (index->tree)
@@ -3549,9 +3527,9 @@ static int git_index_read_iterator(
 	error = 0;
 
 done:
-	git_idxmap_free(new_entries_map);
-	git_vector_free(&new_entries);
-	git_vector_free(&remove_entries);
+	git_index_entrymap_dispose(&new_entries_map);
+	git_vector_dispose(&new_entries);
+	git_vector_dispose(&remove_entries);
 	git_iterator_free(index_iterator);
 	return error;
 }
@@ -3852,7 +3830,7 @@ int git_index_snapshot_new(git_vector *snap, git_index *index)
 
 void git_index_snapshot_release(git_vector *snap, git_index *index)
 {
-	git_vector_free(snap);
+	git_vector_dispose(snap);
 
 	git_atomic32_dec(&index->readers);