rugged 0.27.10 → 0.27.10.1

data/vendor/libgit2/src/buffer.h

@@ -76,7 +76,7 @@ extern char *git_buf_detach(git_buf *buf);
 extern int git_buf_attach(git_buf *buf, char *ptr, size_t asize);
 
 /* Populates a `git_buf` where the contents are not "owned" by the
- * buffer, and calls to `git_buf_dispose` will not free the given buf.
+ * buffer, and calls to `git_buf_free` will not free the given buf.
  */
 extern void git_buf_attach_notowned(
 	git_buf *buf, const char *ptr, size_t size);

data/vendor/libgit2/src/cache.c

@@ -20,20 +20,20 @@ ssize_t git_cache__max_storage = (256 * 1024 * 1024);
 git_atomic_ssize git_cache__current_storage = {0};
 
 static size_t git_cache__max_object_size[8] = {
-	0,     /* GIT_OBJECT__EXT1 */
-	4096,  /* GIT_OBJECT_COMMIT */
-	4096,  /* GIT_OBJECT_TREE */
-	0,     /* GIT_OBJECT_BLOB */
-	4096,  /* GIT_OBJECT_TAG */
-	0,     /* GIT_OBJECT__EXT2 */
-	0,     /* GIT_OBJECT_OFS_DELTA */
-	0      /* GIT_OBJECT_REF_DELTA */
+	0,     /* GIT_OBJ__EXT1 */
+	4096,  /* GIT_OBJ_COMMIT */
+	4096,  /* GIT_OBJ_TREE */
+	0,     /* GIT_OBJ_BLOB */
+	4096,  /* GIT_OBJ_TAG */
+	0,     /* GIT_OBJ__EXT2 */
+	0,     /* GIT_OBJ_OFS_DELTA */
+	0      /* GIT_OBJ_REF_DELTA */
 };
 
-int git_cache_set_max_object_size(git_object_t type, size_t size)
+int git_cache_set_max_object_size(git_otype type, size_t size)
 {
 	if (type < 0 || (size_t)type >= ARRAY_SIZE(git_cache__max_object_size)) {
-		git_error_set(GIT_ERROR_INVALID, "type out of range");
+		giterr_set(GITERR_INVALID, "type out of range");
 		return -1;
 	}
 
@@ -65,15 +65,12 @@ void git_cache_dump_stats(git_cache *cache)
 int git_cache_init(git_cache *cache)
 {
 	memset(cache, 0, sizeof(*cache));
-
-	if ((git_oidmap_new(&cache->map)) < 0)
-		return -1;
-
+	cache->map = git_oidmap_alloc();
+	GITERR_CHECK_ALLOC(cache->map);
 	if (git_rwlock_init(&cache->lock)) {
-		git_error_set(GIT_ERROR_OS, "failed to initialize cache rwlock");
+		giterr_set(GITERR_OS, "failed to initialize cache rwlock");
 		return -1;
 	}
-
 	return 0;
 }
 
@@ -104,7 +101,7 @@ void git_cache_clear(git_cache *cache)
 	git_rwlock_wrunlock(&cache->lock);
 }
 
-void git_cache_dispose(git_cache *cache)
+void git_cache_free(git_cache *cache)
 {
 	git_cache_clear(cache);
 	git_oidmap_free(cache->map);
@@ -115,37 +112,35 @@ void git_cache_dispose(git_cache *cache)
 /* Called with lock */
 static void cache_evict_entries(git_cache *cache)
 {
-	size_t evict_count = git_cache_size(cache) / 2048, i;
+	uint32_t seed = rand();
+	size_t evict_count = 8;
 	ssize_t evicted_memory = 0;
 
-	if (evict_count < 8)
-		evict_count = 8;
-
 	/* do not infinite loop if there's not enough entries to evict  */
 	if (evict_count > git_cache_size(cache)) {
 		clear_cache(cache);
 		return;
 	}
 
-	i = 0;
 	while (evict_count > 0) {
-		git_cached_obj *evict;
-		const git_oid *key;
+		khiter_t pos = seed++ % git_oidmap_end(cache->map);
 
-		if (git_oidmap_iterate((void **) &evict, cache->map, &i, &key) == GIT_ITEROVER)
-			break;
+		if (git_oidmap_has_data(cache->map, pos)) {
+			git_cached_obj *evict = git_oidmap_value_at(cache->map, pos);
 
-		evict_count--;
-		evicted_memory += evict->size;
-		git_oidmap_delete(cache->map, key);
-		git_cached_obj_decref(evict);
+			evict_count--;
+			evicted_memory += evict->size;
+			git_cached_obj_decref(evict);
+
+			git_oidmap_delete_at(cache->map, pos);
+		}
 	}
 
 	cache->used_memory -= evicted_memory;
 	git_atomic_ssize_add(&git_cache__current_storage, -evicted_memory);
 }
 
-static bool cache_should_store(git_object_t object_type, size_t object_size)
+static bool cache_should_store(git_otype object_type, size_t object_size)
 {
 	size_t max_size = git_cache__max_object_size[object_type];
 	return git_cache__enabled && object_size < max_size;
@@ -153,12 +148,16 @@ static bool cache_should_store(git_object_t object_type, size_t object_size)
 
 static void *cache_get(git_cache *cache, const git_oid *oid, unsigned int flags)
 {
-	git_cached_obj *entry;
+	khiter_t pos;
+	git_cached_obj *entry = NULL;
 
 	if (!git_cache__enabled || git_rwlock_rdlock(&cache->lock) < 0)
 		return NULL;
 
-	if ((entry = git_oidmap_get(cache->map, oid)) != NULL) {
+	pos = git_oidmap_lookup_index(cache->map, oid);
+	if (git_oidmap_valid_index(cache->map, pos)) {
+		entry = git_oidmap_value_at(cache->map, pos);
+
 		if (flags && entry->flags != flags) {
 			entry = NULL;
 		} else {
@@ -173,7 +172,7 @@ static void *cache_get(git_cache *cache, const git_oid *oid, unsigned int flags)
 
 static void *cache_store(git_cache *cache, git_cached_obj *entry)
 {
-	git_cached_obj *stored_entry;
+	khiter_t pos;
 
 	git_cached_obj_incref(entry);
 
@@ -192,9 +191,14 @@ static void *cache_store(git_cache *cache, git_cached_obj *entry)
 	if (git_cache__current_storage.val > git_cache__max_storage)
 		cache_evict_entries(cache);
 
+	pos = git_oidmap_lookup_index(cache->map, &entry->oid);
+
 	/* not found */
-	if ((stored_entry = git_oidmap_get(cache->map, &entry->oid)) == NULL) {
-		if (git_oidmap_set(cache->map, &entry->oid, entry) == 0) {
+	if (!git_oidmap_valid_index(cache->map, pos)) {
+		int rval;
+
+		git_oidmap_insert(cache->map, &entry->oid, entry, &rval);
+		if (rval >= 0) {
 			git_cached_obj_incref(entry);
 			cache->used_memory += entry->size;
 			git_atomic_ssize_add(&git_cache__current_storage, (ssize_t)entry->size);
@@ -202,16 +206,19 @@ static void *cache_store(git_cache *cache, git_cached_obj *entry)
 	}
 	/* found */
 	else {
+		git_cached_obj *stored_entry = git_oidmap_value_at(cache->map, pos);
+
 		if (stored_entry->flags == entry->flags) {
 			git_cached_obj_decref(entry);
 			git_cached_obj_incref(stored_entry);
 			entry = stored_entry;
 		} else if (stored_entry->flags == GIT_CACHE_STORE_RAW &&
-			   entry->flags == GIT_CACHE_STORE_PARSED) {
+			entry->flags == GIT_CACHE_STORE_PARSED) {
 			git_cached_obj_decref(stored_entry);
 			git_cached_obj_incref(entry);
 
-			git_oidmap_set(cache->map, &entry->oid, entry);
+			git_oidmap_set_key_at(cache->map, pos, &entry->oid);
+			git_oidmap_set_value_at(cache->map, pos, entry);
 		} else {
 			/* NO OP */
 		}

data/vendor/libgit2/src/cache.h

@@ -24,7 +24,7 @@ enum {
 
 typedef struct {
 	git_oid    oid;
-	int16_t    type;  /* git_object_t value */
+	int16_t    type;  /* git_otype value */
 	uint16_t   flags; /* GIT_CACHE_STORE value */
 	size_t     size;
 	git_atomic refcount;
@@ -40,10 +40,10 @@ extern bool git_cache__enabled;
 extern ssize_t git_cache__max_storage;
 extern git_atomic_ssize git_cache__current_storage;
 
-int git_cache_set_max_object_size(git_object_t type, size_t size);
+int git_cache_set_max_object_size(git_otype type, size_t size);
 
 int git_cache_init(git_cache *cache);
-void git_cache_dispose(git_cache *cache);
+void git_cache_free(git_cache *cache);
 void git_cache_clear(git_cache *cache);
 
 void *git_cache_store_raw(git_cache *cache, git_odb_object *entry);

data/vendor/libgit2/src/cc-compat.h

@@ -47,29 +47,12 @@
 
 /* Define the printf format specifer to use for size_t output */
 #if defined(_MSC_VER) || defined(__MINGW32__)
-
-/* Visual Studio 2012 and prior lack PRId64 entirely */
-#	ifndef PRId64
-#		define PRId64 "I64d"
-#	endif
-
-/* The first block is needed to avoid warnings on MingW amd64 */
-#	if (SIZE_MAX == ULLONG_MAX)
-#		define PRIuZ "I64u"
-#		define PRIxZ "I64x"
-#		define PRIXZ "I64X"
-#		define PRIdZ "I64d"
-#	else
-#		define PRIuZ "Iu"
-#		define PRIxZ "Ix"
-#		define PRIXZ "IX"
-#		define PRIdZ "Id"
-#	endif
-
+#	define PRIuZ "Iu"
+#	define PRIxZ "Ix"
+#	define PRIdZ "Id"
 #else
 #	define PRIuZ "zu"
 #	define PRIxZ "zx"
-#	define PRIXZ "zX"
 #	define PRIdZ "zd"
 #endif
 

data/vendor/libgit2/src/checkout.c

@@ -7,6 +7,8 @@
 
 #include "checkout.h"
 
+#include <assert.h>
+
 #include "git2/repository.h"
 #include "git2/refs.h"
 #include "git2/tree.h"
@@ -144,7 +146,7 @@ static int checkout_notify(
 		int error = data->opts.notify_cb(
 			why, path, baseline, target, workdir, data->opts.notify_payload);
 
-		return git_error_set_after_callback_function(
+		return giterr_set_after_callback_function(
 			error, "git_checkout notification");
 	}
 }
@@ -191,7 +193,7 @@ static bool checkout_is_workdir_modified(
 		bool rval = false;
 
 		if (git_submodule_lookup(&sm, data->repo, wditem->path) < 0) {
-			git_error_clear();
+			giterr_clear();
 			return true;
 		}
 
@@ -352,7 +354,7 @@ static bool wd_item_is_removable(
 static int checkout_queue_remove(checkout_data *data, const char *path)
 {
 	char *copy = git_pool_strdup(&data->pool, path);
-	GIT_ERROR_CHECK_ALLOC(copy);
+	GITERR_CHECK_ALLOC(copy);
 	return git_vector_insert(&data->removes, copy);
 }
 
@@ -490,7 +492,7 @@ static int checkout_action_with_wd(
 	switch (delta->status) {
 	case GIT_DELTA_UNMODIFIED: /* case 14/15 or 33 */
 		if (checkout_is_workdir_modified(data, &delta->old_file, &delta->new_file, wd)) {
-			GIT_ERROR_CHECK_ERROR(
+			GITERR_CHECK_ERROR(
 				checkout_notify(data, GIT_CHECKOUT_NOTIFY_DIRTY, delta, wd) );
 			*action = CHECKOUT_ACTION_IF(FORCE, UPDATE_BLOB, NONE);
 		}
@@ -559,7 +561,7 @@ static int checkout_action_with_wd_blocker(
 	switch (delta->status) {
 	case GIT_DELTA_UNMODIFIED:
 		/* should show delta as dirty / deleted */
-		GIT_ERROR_CHECK_ERROR(
+		GITERR_CHECK_ERROR(
 			checkout_notify(data, GIT_CHECKOUT_NOTIFY_DIRTY, delta, wd) );
 		*action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, NONE);
 		break;
@@ -592,9 +594,9 @@ static int checkout_action_with_wd_dir(
 
 	switch (delta->status) {
 	case GIT_DELTA_UNMODIFIED: /* case 19 or 24 (or 34 but not really) */
-		GIT_ERROR_CHECK_ERROR(
+		GITERR_CHECK_ERROR(
 			checkout_notify(data, GIT_CHECKOUT_NOTIFY_DIRTY, delta, NULL));
-		GIT_ERROR_CHECK_ERROR(
+		GITERR_CHECK_ERROR(
 			checkout_notify(data, GIT_CHECKOUT_NOTIFY_UNTRACKED, NULL, wd));
 		*action = CHECKOUT_ACTION_IF(FORCE, REMOVE_AND_UPDATE, NONE);
 		break;
@@ -609,7 +611,7 @@ static int checkout_action_with_wd_dir(
 		break;
 	case GIT_DELTA_DELETED: /* case 11 (and 27 for dir) */
 		if (delta->old_file.mode != GIT_FILEMODE_TREE)
-			GIT_ERROR_CHECK_ERROR(
+			GITERR_CHECK_ERROR(
 				checkout_notify(data, GIT_CHECKOUT_NOTIFY_UNTRACKED, NULL, wd));
 		break;
 	case GIT_DELTA_TYPECHANGE: /* case 24 or 31 */
@@ -900,7 +902,7 @@ static int checkout_conflict_append_update(
 	int error;
 
 	conflict = git__calloc(1, sizeof(checkout_conflictdata));
-	GIT_ERROR_CHECK_ALLOC(conflict);
+	GITERR_CHECK_ALLOC(conflict);
 
 	conflict->ancestor = ancestor;
 	conflict->ours = ours;
@@ -1042,20 +1044,20 @@ static int checkout_conflicts_load_byname_entry(
 	*theirs_out = NULL;
 
 	if (!name_entry->ancestor) {
-		git_error_set(GIT_ERROR_INDEX, "a NAME entry exists without an ancestor");
+		giterr_set(GITERR_INDEX, "a NAME entry exists without an ancestor");
 		error = -1;
 		goto done;
 	}
 
 	if (!name_entry->ours && !name_entry->theirs) {
-		git_error_set(GIT_ERROR_INDEX, "a NAME entry exists without an ours or theirs");
+		giterr_set(GITERR_INDEX, "a NAME entry exists without an ours or theirs");
 		error = -1;
 		goto done;
 	}
 
 	if ((ancestor = checkout_conflicts_search_ancestor(data,
 		name_entry->ancestor)) == NULL) {
-		git_error_set(GIT_ERROR_INDEX,
+		giterr_set(GITERR_INDEX,
 			"a NAME entry referenced ancestor entry '%s' which does not exist in the main index",
 			name_entry->ancestor);
 		error = -1;
@@ -1067,7 +1069,7 @@ static int checkout_conflicts_load_byname_entry(
 			ours = ancestor;
 		else if ((ours = checkout_conflicts_search_branch(data, name_entry->ours)) == NULL ||
 			ours->ours == NULL) {
-			git_error_set(GIT_ERROR_INDEX,
+			giterr_set(GITERR_INDEX,
 				"a NAME entry referenced our entry '%s' which does not exist in the main index",
 				name_entry->ours);
 			error = -1;
@@ -1082,7 +1084,7 @@ static int checkout_conflicts_load_byname_entry(
 			theirs = ours;
 		else if ((theirs = checkout_conflicts_search_branch(data, name_entry->theirs)) == NULL ||
 			theirs->theirs == NULL) {
-			git_error_set(GIT_ERROR_INDEX,
+			giterr_set(GITERR_INDEX,
 				"a NAME entry referenced their entry '%s' which does not exist in the main index",
 				name_entry->theirs);
 			error = -1;
@@ -1181,7 +1183,7 @@ static int checkout_conflicts_mark_directoryfile(
 
 		if ((error = git_index_find(&j, index, path)) < 0) {
 			if (error == GIT_ENOTFOUND)
-				git_error_set(GIT_ERROR_INDEX,
+				giterr_set(GITERR_INDEX,
 					"index inconsistency, could not find entry for expected conflict '%s'", path);
 
 			goto done;
@@ -1189,7 +1191,7 @@ static int checkout_conflicts_mark_directoryfile(
 
 		for (; j < len; j++) {
 			if ((entry = git_index_get_byindex(index, j)) == NULL) {
-				git_error_set(GIT_ERROR_INDEX,
+				giterr_set(GITERR_INDEX,
 					"index inconsistency, truncated index while loading expected conflict '%s'", path);
 				error = -1;
 				goto done;
@@ -1250,7 +1252,7 @@ static int checkout_conflict_append_remove(
 	else
 		abort();
 
-	GIT_ERROR_CHECK_ALLOC(name);
+	GITERR_CHECK_ALLOC(name);
 
 	return git_vector_insert(&data->remove_conflicts, (char *)name);
 }
@@ -1275,14 +1277,14 @@ static int checkout_verify_paths(
 
 	if (action & CHECKOUT_ACTION__REMOVE) {
 		if (!git_path_isvalid(repo, delta->old_file.path, delta->old_file.mode, flags)) {
-			git_error_set(GIT_ERROR_CHECKOUT, "cannot remove invalid path '%s'", delta->old_file.path);
+			giterr_set(GITERR_CHECKOUT, "cannot remove invalid path '%s'", delta->old_file.path);
 			return -1;
 		}
 	}
 
 	if (action & ~CHECKOUT_ACTION__REMOVE) {
 		if (!git_path_isvalid(repo, delta->new_file.path, delta->new_file.mode, flags)) {
-			git_error_set(GIT_ERROR_CHECKOUT, "cannot checkout to invalid path '%s'", delta->new_file.path);
+			giterr_set(GITERR_CHECKOUT, "cannot checkout to invalid path '%s'", delta->new_file.path);
 			return -1;
 		}
 	}
@@ -1352,7 +1354,7 @@ static int checkout_get_actions(
 	if (counts[CHECKOUT_ACTION__CONFLICT] > 0 &&
 		(data->strategy & GIT_CHECKOUT_ALLOW_CONFLICTS) == 0)
 	{
-		git_error_set(GIT_ERROR_CHECKOUT, "%"PRIuZ" %s checkout",
+		giterr_set(GITERR_CHECKOUT, "%"PRIuZ" %s checkout",
 			counts[CHECKOUT_ACTION__CONFLICT],
 			counts[CHECKOUT_ACTION__CONFLICT] == 1 ?
 			"conflict prevents" : "conflicts prevent");
@@ -1389,7 +1391,7 @@ static bool should_remove_existing(checkout_data *data)
 {
 	int ignorecase;
 
-	if (git_repository__configmap_lookup(&ignorecase, data->repo, GIT_CONFIGMAP_IGNORECASE) < 0) {
+	if (git_repository__cvar(&ignorecase, data->repo, GIT_CVAR_IGNORECASE) < 0) {
 		ignorecase = 0;
 	}
 
@@ -1451,10 +1453,10 @@ static int mkpath2file(
 			 */
 			error = git_futils_rmdir_r(path, NULL, GIT_RMDIR_REMOVE_FILES);
 		} else if (errno != ENOENT) {
-			git_error_set(GIT_ERROR_OS, "failed to stat '%s'", path);
+			giterr_set(GITERR_OS, "failed to stat '%s'", path);
 			return GIT_EEXISTS;
 		} else {
-			git_error_clear();
+			giterr_clear();
 		}
 	}
 
@@ -1475,7 +1477,7 @@ static int checkout_stream_write(
 	int ret;
 
 	if ((ret = p_write(stream->fd, buffer, len)) < 0)
-		git_error_set(GIT_ERROR_OS, "could not write to '%s'", stream->path);
+		giterr_set(GITERR_OS, "could not write to '%s'", stream->path);
 
 	return ret;
 }
@@ -1524,7 +1526,7 @@ static int blob_content_to_file(
 		mode = GIT_FILEMODE_BLOB;
 
 	if ((fd = p_open(path, flags, mode)) < 0) {
-		git_error_set(GIT_ERROR_OS, "could not open '%s' for writing", path);
+		giterr_set(GITERR_OS, "could not open '%s' for writing", path);
 		return fd;
 	}
 
@@ -1561,7 +1563,7 @@ static int blob_content_to_file(
 		data->perfdata.stat_calls++;
 
 		if ((error = p_stat(path, st)) < 0) {
-			git_error_set(GIT_ERROR_OS, "failed to stat '%s'", path);
+			giterr_set(GITERR_OS, "failed to stat '%s'", path);
 			return error;
 		}
 
@@ -1588,7 +1590,7 @@ static int blob_content_to_link(
 
 	if (data->can_symlink) {
 		if ((error = p_symlink(git_buf_cstr(&linktarget), path)) < 0)
-			git_error_set(GIT_ERROR_OS, "could not create symlink %s", path);
+			giterr_set(GITERR_OS, "could not create symlink %s", path);
 	} else {
 		error = git_futils_fake_symlink(git_buf_cstr(&linktarget), path);
 	}
@@ -1597,12 +1599,12 @@ static int blob_content_to_link(
 		data->perfdata.stat_calls++;
 
 		if ((error = p_lstat(path, st)) < 0)
-			git_error_set(GIT_ERROR_CHECKOUT, "could not stat symlink %s", path);
+			giterr_set(GITERR_CHECKOUT, "could not stat symlink %s", path);
 
 		st->st_mode = GIT_FILEMODE_LINK;
 	}
 
-	git_buf_dispose(&linktarget);
+	git_buf_free(&linktarget);
 
 	return error;
 }
@@ -1641,8 +1643,8 @@ static int checkout_submodule_update_index(
 
 	data->perfdata.stat_calls++;
 	if (p_stat(fullpath->ptr, &st) < 0) {
-		git_error_set(
-			GIT_ERROR_CHECKOUT, "could not stat submodule %s\n", file->path);
+		giterr_set(
+			GITERR_CHECKOUT, "could not stat submodule %s\n", file->path);
 		return GIT_ENOTFOUND;
 	}
 
@@ -1673,7 +1675,7 @@ static int checkout_submodule(
 		 * have a .gitmodules - core Git just makes an empty directory
 		 */
 		if (error == GIT_ENOTFOUND) {
-			git_error_clear();
+			giterr_clear();
 			return checkout_submodule_update_index(data, file);
 		}
 
@@ -1715,7 +1717,7 @@ static int checkout_safe_for_update_only(
 			return 0;
 
 		/* otherwise, stat error and no update */
-		git_error_set(GIT_ERROR_OS, "failed to stat '%s'", path);
+		giterr_set(GITERR_OS, "failed to stat '%s'", path);
 		return -1;
 	}
 
@@ -1754,7 +1756,7 @@ static int checkout_write_content(
 	if ((data->strategy & GIT_CHECKOUT_ALLOW_CONFLICTS) != 0 &&
 		(error == GIT_ENOTFOUND || error == GIT_EEXISTS))
 	{
-		git_error_clear();
+		giterr_clear();
 		error = 0;
 	}
 
@@ -1861,7 +1863,7 @@ static int checkout_deferred_remove(git_repository *repo, const char *path)
 
 	if (error == GIT_ENOTFOUND) {
 		error = 0;
-		git_error_clear();
+		giterr_clear();
 	}
 
 	return error;
@@ -1891,18 +1893,11 @@ static int checkout_create_the_new(
 				return error;
 		}
 
-		if (actions[i] & CHECKOUT_ACTION__UPDATE_BLOB && !S_ISLNK(delta->new_file.mode)) {
-			if ((error = checkout_blob(data, &delta->new_file)) < 0)
+		if (actions[i] & CHECKOUT_ACTION__UPDATE_BLOB) {
+			error = checkout_blob(data, &delta->new_file);
+			if (error < 0)
 				return error;
-			data->completed_steps++;
-			report_progress(data, delta->new_file.path);
-		}
-	}
 
-	git_vector_foreach(&data->diff->deltas, i, delta) {
-		if (actions[i] & CHECKOUT_ACTION__UPDATE_BLOB && S_ISLNK(delta->new_file.mode)) {
-			if ((error = checkout_blob(data, &delta->new_file)) < 0)
-				return error;
 			data->completed_steps++;
 			report_progress(data, delta->new_file.path);
 		}
@@ -1949,7 +1944,7 @@ static int checkout_lookup_head_tree(git_tree **out, git_repository *repo)
 	git_object *head;
 
 	if (!(error = git_repository_head(&ref, repo)) &&
-		!(error = git_reference_peel(&head, ref, GIT_OBJECT_TREE)))
+		!(error = git_reference_peel(&head, ref, GIT_OBJ_TREE)))
 		*out = (git_tree *)head;
 
 	git_reference_free(ref);
@@ -1994,7 +1989,7 @@ static int checkout_path_suffixed(git_buf *path, const char *suffix)
 	if (i == INT_MAX) {
 		git_buf_truncate(path, path_len);
 
-		git_error_set(GIT_ERROR_CHECKOUT, "could not write '%s': working directory file exists", path->ptr);
+		giterr_set(GITERR_CHECKOUT, "could not write '%s': working directory file exists", path->ptr);
 		return GIT_EEXISTS;
 	}
 
@@ -2128,7 +2123,7 @@ static int checkout_write_merge(
 		goto done;
 
 	if (result.path == NULL || result.mode == 0) {
-		git_error_set(GIT_ERROR_CHECKOUT, "could not merge contents of file");
+		giterr_set(GITERR_CHECKOUT, "could not merge contents of file");
 		error = GIT_ECONFLICT;
 		goto done;
 	}
@@ -2166,13 +2161,13 @@ static int checkout_write_merge(
 done:
 	git_filter_list_free(fl);
 
-	git_buf_dispose(&out_data);
-	git_buf_dispose(&our_label);
-	git_buf_dispose(&their_label);
+	git_buf_free(&out_data);
+	git_buf_free(&our_label);
+	git_buf_free(&their_label);
 
 	git_merge_file_result_free(&result);
-	git_buf_dispose(&path_workdir);
-	git_buf_dispose(&path_suffixed);
+	git_buf_free(&path_workdir);
+	git_buf_free(&path_suffixed);
 
 	return error;
 }
@@ -2184,7 +2179,7 @@ static int checkout_conflict_add(
 	int error = git_index_remove(data->index, conflict->path, 0);
 
 	if (error == GIT_ENOTFOUND)
-		git_error_clear();
+		giterr_clear();
 	else if (error < 0)
 		return error;
 
@@ -2352,8 +2347,8 @@ static void checkout_data_clear(checkout_data *data)
 	git__free(data->pfx);
 	data->pfx = NULL;
 
-	git_buf_dispose(&data->target_path);
-	git_buf_dispose(&data->tmp);
+	git_buf_free(&data->target_path);
+	git_buf_free(&data->tmp);
 
 	git_index_free(data->index);
 	data->index = NULL;
@@ -2375,7 +2370,7 @@ static int checkout_data_init(
 	memset(data, 0, sizeof(*data));
 
 	if (!repo) {
-		git_error_set(GIT_ERROR_CHECKOUT, "cannot checkout nothing");
+		giterr_set(GITERR_CHECKOUT, "cannot checkout nothing");
 		return -1;
 	}
 
@@ -2386,7 +2381,7 @@ static int checkout_data_init(
 	data->repo = repo;
 	data->target = target;
 
-	GIT_ERROR_CHECK_VERSION(
+	GITERR_CHECK_VERSION(
 		proposed, GIT_CHECKOUT_OPTIONS_VERSION, "git_checkout_options");
 
 	if (!proposed)
@@ -2402,9 +2397,6 @@ static int checkout_data_init(
 				GIT_DIR_MODE, GIT_MKDIR_VERIFY_DIR)) < 0)
 		goto cleanup;
 
-	if ((error = git_repository_index(&data->index, data->repo)) < 0)
-		goto cleanup;
-
 	/* refresh config and index content unless NO_REFRESH is given */
 	if ((data->opts.checkout_strategy & GIT_CHECKOUT_NO_REFRESH) == 0) {
 		git_config *cfg;
@@ -2412,30 +2404,24 @@ static int checkout_data_init(
 		if ((error = git_repository_config__weakptr(&cfg, repo)) < 0)
 			goto cleanup;
 
-		/* Reload the repository index (unless we're checking out the
-		 * index; then it has the changes we're trying to check out
-		 * and those should not be overwritten.)
+		/* Get the repository index and reload it (unless we're checking
+		 * out the index; then it has the changes we're trying to check
+		 * out and those should not be overwritten.)
 		 */
-		if (data->index != git_iterator_index(target)) {
-			if (data->opts.checkout_strategy & GIT_CHECKOUT_FORCE) {
-				/* When forcing, we can blindly re-read the index */
-				if ((error = git_index_read(data->index, false)) < 0)
-					goto cleanup;
-			} else {
-				/*
-				 * When not being forced, we need to check for unresolved
-				 * conflicts and unsaved changes in the index before
-				 * proceeding.
-				 */
-				if (git_index_has_conflicts(data->index)) {
-					error = GIT_ECONFLICT;
-					git_error_set(GIT_ERROR_CHECKOUT,
-						"unresolved conflicts exist in the index");
-					goto cleanup;
-				}
+		if ((error = git_repository_index(&data->index, data->repo)) < 0)
+			goto cleanup;
 
-				if ((error = git_index_read_safely(data->index)) < 0)
-					goto cleanup;
+		if (data->index != git_iterator_index(target)) {
+			if ((error = git_index_read(data->index, true)) < 0)
+				goto cleanup;
+
+			/* cannot checkout if unresolved conflicts exist */
+			if ((data->opts.checkout_strategy & GIT_CHECKOUT_FORCE) == 0 &&
+				git_index_has_conflicts(data->index)) {
+				error = GIT_ECONFLICT;
+				giterr_set(GITERR_CHECKOUT,
+					"unresolved conflicts exist in the index");
+				goto cleanup;
 			}
 
 			/* clean conflict data in the current index */
@@ -2468,12 +2454,12 @@ static int checkout_data_init(
 
 	data->pfx = git_pathspec_prefix(&data->opts.paths);
 
-	if ((error = git_repository__configmap_lookup(
-			 &data->can_symlink, repo, GIT_CONFIGMAP_SYMLINKS)) < 0)
+	if ((error = git_repository__cvar(
+			 &data->can_symlink, repo, GIT_CVAR_SYMLINKS)) < 0)
 		goto cleanup;
 
-	if ((error = git_repository__configmap_lookup(
-			 &data->respect_filemode, repo, GIT_CONFIGMAP_FILEMODE)) < 0)
+	if ((error = git_repository__cvar(
+			 &data->respect_filemode, repo, GIT_CVAR_FILEMODE)) < 0)
 		goto cleanup;
 
 	if (!data->opts.baseline && !data->opts.baseline_index) {
@@ -2488,7 +2474,7 @@ static int checkout_data_init(
 
 		if (error == GIT_EUNBORNBRANCH) {
 			error = 0;
-			git_error_clear();
+			giterr_clear();
 		}
 
 		if (error < 0)
@@ -2511,7 +2497,7 @@ static int checkout_data_init(
 		else if (strcmp(conflict_style->value, "diff3") == 0)
 			data->opts.checkout_strategy |= GIT_CHECKOUT_CONFLICT_STYLE_DIFF3;
 		else {
-			git_error_set(GIT_ERROR_CHECKOUT, "unknown style '%s' given for 'merge.conflictstyle'",
+			giterr_set(GITERR_CHECKOUT, "unknown style '%s' given for 'merge.conflictstyle'",
 				conflict_style->value);
 			error = -1;
 			git_config_entry_free(conflict_style);
@@ -2523,11 +2509,11 @@ static int checkout_data_init(
 	git_pool_init(&data->pool, 1);
 
 	if ((error = git_vector_init(&data->removes, 0, git__strcmp_cb)) < 0 ||
-	    (error = git_vector_init(&data->remove_conflicts, 0, NULL)) < 0 ||
-	    (error = git_vector_init(&data->update_conflicts, 0, NULL)) < 0 ||
-	    (error = git_buf_puts(&data->target_path, data->opts.target_directory)) < 0 ||
-	    (error = git_path_to_dir(&data->target_path)) < 0 ||
-	    (error = git_strmap_new(&data->mkdir_map)) < 0)
+		(error = git_vector_init(&data->remove_conflicts, 0, NULL)) < 0 ||
+		(error = git_vector_init(&data->update_conflicts, 0, NULL)) < 0 ||
+		(error = git_buf_puts(&data->target_path, data->opts.target_directory)) < 0 ||
+		(error = git_path_to_dir(&data->target_path)) < 0 ||
+		(error = git_strmap_alloc(&data->mkdir_map)) < 0)
 		goto cleanup;
 
 	data->target_len = git_buf_len(&data->target_path);
@@ -2693,7 +2679,7 @@ int git_checkout_index(
 	git_iterator *index_i;
 
 	if (!index && !repo) {
-		git_error_set(GIT_ERROR_CHECKOUT,
+		giterr_set(GITERR_CHECKOUT,
 			"must provide either repository or index to checkout");
 		return -1;
 	}
@@ -2701,7 +2687,7 @@ int git_checkout_index(
 	if (index && repo &&
 		git_index_owner(index) &&
 		git_index_owner(index) != repo) {
-		git_error_set(GIT_ERROR_CHECKOUT,
+		giterr_set(GITERR_CHECKOUT,
 			"index to checkout does not match repository");
 		return -1;
 	} else if(index && repo && !git_index_owner(index)) {
@@ -2740,12 +2726,12 @@ int git_checkout_tree(
 	git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT;
 
 	if (!treeish && !repo) {
-		git_error_set(GIT_ERROR_CHECKOUT,
+		giterr_set(GITERR_CHECKOUT,
 			"must provide either repository or tree to checkout");
 		return -1;
 	}
 	if (treeish && repo && git_object_owner(treeish) != repo) {
-		git_error_set(GIT_ERROR_CHECKOUT,
+		giterr_set(GITERR_CHECKOUT,
 			"object to checkout does not match repository");
 		return -1;
 	}
@@ -2754,17 +2740,17 @@ int git_checkout_tree(
 		repo = git_object_owner(treeish);
 
 	if (treeish) {
-		if (git_object_peel((git_object **)&tree, treeish, GIT_OBJECT_TREE) < 0) {
-			git_error_set(
-				GIT_ERROR_CHECKOUT, "provided object cannot be peeled to a tree");
+		if (git_object_peel((git_object **)&tree, treeish, GIT_OBJ_TREE) < 0) {
+			giterr_set(
+				GITERR_CHECKOUT, "provided object cannot be peeled to a tree");
 			return -1;
 		}
 	}
 	else {
 		if ((error = checkout_lookup_head_tree(&tree, repo)) < 0) {
 			if (error != GIT_EUNBORNBRANCH)
-				git_error_set(
-					GIT_ERROR_CHECKOUT,
+				giterr_set(
+					GITERR_CHECKOUT,
 					"HEAD could not be peeled to a tree and no treeish given");
 			return error;
 		}
@@ -2796,14 +2782,9 @@ int git_checkout_head(
 	return git_checkout_tree(repo, NULL, opts);
 }
 
-int git_checkout_options_init(git_checkout_options *opts, unsigned int version)
+int git_checkout_init_options(git_checkout_options *opts, unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
 		opts, version, git_checkout_options, GIT_CHECKOUT_OPTIONS_INIT);
 	return 0;
 }
-
-int git_checkout_init_options(git_checkout_options *opts, unsigned int version)
-{
-	return git_checkout_options_init(opts, version);
-}