rugged 0.27.10 → 0.27.10.1

data/vendor/libgit2/src/settings.c

@@ -11,22 +11,15 @@
 # include <openssl/err.h>
 #endif
 
-#ifdef GIT_MBEDTLS
-# include <mbedtls/error.h>
-#endif
-
 #include <git2.h>
-#include "alloc.h"
 #include "sysdir.h"
 #include "cache.h"
 #include "global.h"
 #include "object.h"
 #include "odb.h"
 #include "refs.h"
-#include "index.h"
 #include "transports/smart.h"
 #include "streams/openssl.h"
-#include "streams/mbedtls.h"
 
 void git_libgit2_version(int *major, int *minor, int *rev)
 {
@@ -56,8 +49,6 @@ int git_libgit2_features(void)
 /* Declarations for tuneable settings */
 extern size_t git_mwindow__window_size;
 extern size_t git_mwindow__mapped_limit;
-extern size_t git_indexer__max_objects;
-extern bool git_disable_pack_keep_file_checks;
 
 static int config_level_to_sysdir(int config_level)
 {
@@ -77,8 +68,8 @@ static int config_level_to_sysdir(int config_level)
 		val = GIT_SYSDIR_PROGRAMDATA;
 		break;
 	default:
-		git_error_set(
-			GIT_ERROR_INVALID, "invalid config path selector %d", config_level);
+		giterr_set(
+			GITERR_INVALID, "invalid config path selector %d", config_level);
 	}
 
 	return val;
@@ -141,7 +132,7 @@ int git_libgit2_opts(int key, ...)
 
 	case GIT_OPT_SET_CACHE_OBJECT_LIMIT:
 		{
-			git_object_t type = (git_object_t)va_arg(ap, int);
+			git_otype type = (git_otype)va_arg(ap, int);
 			size_t size = va_arg(ap, size_t);
 			error = git_cache_set_max_object_size(type, size);
 			break;
@@ -184,17 +175,8 @@ int git_libgit2_opts(int key, ...)
 			const char *path = va_arg(ap, const char *);
 			error = git_openssl__set_cert_location(file, path);
 		}
-#elif defined(GIT_MBEDTLS)
-		{
-			const char *file = va_arg(ap, const char *);
-			const char *path = va_arg(ap, const char *);
-			if (file)
-				error = git_mbedtls__set_cert_location(file, 0);
-			if (error && path)
-				error = git_mbedtls__set_cert_location(path, 1);
-		}
 #else
-		git_error_set(GIT_ERROR_SSL, "TLS backend doesn't support certificate locations");
+		giterr_set(GITERR_SSL, "TLS backend doesn't support certificate locations");
 		error = -1;
 #endif
 		break;
@@ -202,7 +184,7 @@ int git_libgit2_opts(int key, ...)
 		git__free(git__user_agent);
 		git__user_agent = git__strdup(va_arg(ap, const char *));
 		if (!git__user_agent) {
-			git_error_set_oom();
+			giterr_set_oom();
 			error = -1;
 		}
 
@@ -217,17 +199,17 @@ int git_libgit2_opts(int key, ...)
 		break;
 
 	case GIT_OPT_SET_SSL_CIPHERS:
-#if (GIT_OPENSSL || GIT_MBEDTLS)
+#ifdef GIT_OPENSSL
 		{
 			git__free(git__ssl_ciphers);
 			git__ssl_ciphers = git__strdup(va_arg(ap, const char *));
 			if (!git__ssl_ciphers) {
-				git_error_set_oom();
+				giterr_set_oom();
 				error = -1;
 			}
 		}
 #else
-		git_error_set(GIT_ERROR_SSL, "TLS backend doesn't support custom ciphers");
+		giterr_set(GITERR_SSL, "TLS backend doesn't support custom ciphers");
 		error = -1;
 #endif
 		break;
@@ -264,28 +246,8 @@ int git_libgit2_opts(int key, ...)
 		git_odb__strict_hash_verification = (va_arg(ap, int) != 0);
 		break;
 
-	case GIT_OPT_SET_ALLOCATOR:
-		error = git_allocator_setup(va_arg(ap, git_allocator *));
-		break;
-
-	case GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY:
-		git_index__enforce_unsaved_safety = (va_arg(ap, int) != 0);
-		break;
-
-	case GIT_OPT_SET_PACK_MAX_OBJECTS:
-		git_indexer__max_objects = va_arg(ap, size_t);
-		break;
-
-	case GIT_OPT_GET_PACK_MAX_OBJECTS:
-		*(va_arg(ap, size_t *)) = git_indexer__max_objects;
-		break;
-
-	case GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS:
-		git_disable_pack_keep_file_checks = (va_arg(ap, int) != 0);
-		break;
-
 	default:
-		git_error_set(GIT_ERROR_INVALID, "invalid option key");
+		giterr_set(GITERR_INVALID, "invalid option key");
 		error = -1;
 	}
 
@@ -293,3 +255,4 @@ int git_libgit2_opts(int key, ...)
 
 	return error;
 }
+

data/vendor/libgit2/src/signature.c

@@ -25,7 +25,7 @@ void git_signature_free(git_signature *sig)
 
 static int signature_error(const char *msg)
 {
-	git_error_set(GIT_ERROR_INVALID, "failed to parse signature - %s", msg);
+	giterr_set(GITERR_INVALID, "failed to parse signature - %s", msg);
 	return -1;
 }
 
@@ -76,12 +76,12 @@ int git_signature_new(git_signature **sig_out, const char *name, const char *ema
 	}
 
 	p = git__calloc(1, sizeof(git_signature));
-	GIT_ERROR_CHECK_ALLOC(p);
+	GITERR_CHECK_ALLOC(p);
 
 	p->name = extract_trimmed(name, strlen(name));
-	GIT_ERROR_CHECK_ALLOC(p->name);
+	GITERR_CHECK_ALLOC(p->name);
 	p->email = extract_trimmed(email, strlen(email));
-	GIT_ERROR_CHECK_ALLOC(p->email);
+	GITERR_CHECK_ALLOC(p->email);
 
 	if (p->name[0] == '\0' || p->email[0] == '\0') {
 		git_signature_free(p);
@@ -104,13 +104,13 @@ int git_signature_dup(git_signature **dest, const git_signature *source)
 		return 0;
 
 	signature = git__calloc(1, sizeof(git_signature));
-	GIT_ERROR_CHECK_ALLOC(signature);
+	GITERR_CHECK_ALLOC(signature);
 
 	signature->name = git__strdup(source->name);
-	GIT_ERROR_CHECK_ALLOC(signature->name);
+	GITERR_CHECK_ALLOC(signature->name);
 
 	signature->email = git__strdup(source->email);
-	GIT_ERROR_CHECK_ALLOC(signature->email);
+	GITERR_CHECK_ALLOC(signature->email);
 
 	signature->when.time = source->when.time;
 	signature->when.offset = source->when.offset;
@@ -129,13 +129,13 @@ int git_signature__pdup(git_signature **dest, const git_signature *source, git_p
 		return 0;
 
 	signature = git_pool_mallocz(pool, sizeof(git_signature));
-	GIT_ERROR_CHECK_ALLOC(signature);
+	GITERR_CHECK_ALLOC(signature);
 
 	signature->name = git_pool_strdup(pool, source->name);
-	GIT_ERROR_CHECK_ALLOC(signature->name);
+	GITERR_CHECK_ALLOC(signature->name);
 
 	signature->email = git_pool_strdup(pool, source->email);
-	GIT_ERROR_CHECK_ALLOC(signature->email);
+	GITERR_CHECK_ALLOC(signature->email);
 
 	signature->when.time = source->when.time;
 	signature->when.offset = source->when.offset;
@@ -284,7 +284,7 @@ int git_signature_from_buffer(git_signature **out, const char *buf)
 	*out = NULL;
 
 	sig = git__calloc(1, sizeof(git_signature));
-	GIT_ERROR_CHECK_ALLOC(sig);
+	GITERR_CHECK_ALLOC(sig);
 
 	buf_end = buf + strlen(buf);
 	error = git_signature__parse(sig, &buf, buf_end, NULL, '\0');

data/vendor/libgit2/src/sortedcache.c

@@ -20,19 +20,19 @@ int git_sortedcache_new(
 
 	pathlen = path ? strlen(path) : 0;
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_sortedcache), pathlen);
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
+	GITERR_CHECK_ALLOC_ADD(&alloclen, sizeof(git_sortedcache), pathlen);
+	GITERR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
 	sc = git__calloc(1, alloclen);
-	GIT_ERROR_CHECK_ALLOC(sc);
+	GITERR_CHECK_ALLOC(sc);
 
 	git_pool_init(&sc->pool, 1);
 
 	if (git_vector_init(&sc->items, 4, item_cmp) < 0 ||
-	    git_strmap_new(&sc->map) < 0)
+		git_strmap_alloc(&sc->map) < 0)
 		goto fail;
 
 	if (git_rwlock_init(&sc->lock)) {
-		git_error_set(GIT_ERROR_OS, "failed to initialize lock");
+		giterr_set(GITERR_OS, "failed to initialize lock");
 		goto fail;
 	}
 
@@ -167,7 +167,7 @@ int git_sortedcache_wlock(git_sortedcache *sc)
 	GIT_UNUSED(sc); /* prevent warning when compiled w/o threads */
 
 	if (git_rwlock_wrlock(&sc->lock) < 0) {
-		git_error_set(GIT_ERROR_OS, "unable to acquire write lock on cache");
+		giterr_set(GITERR_OS, "unable to acquire write lock on cache");
 		return -1;
 	}
 	return 0;
@@ -186,7 +186,7 @@ int git_sortedcache_rlock(git_sortedcache *sc)
 	GIT_UNUSED(sc); /* prevent warning when compiled w/o threads */
 
 	if (git_rwlock_rdlock(&sc->lock) < 0) {
-		git_error_set(GIT_ERROR_OS, "unable to acquire read lock on cache");
+		giterr_set(GITERR_OS, "unable to acquire read lock on cache");
 		return -1;
 	}
 	return 0;
@@ -219,14 +219,14 @@ int git_sortedcache_lockandload(git_sortedcache *sc, git_buf *buf)
 	}
 
 	if (p_fstat(fd, &st) < 0) {
-		git_error_set(GIT_ERROR_OS, "failed to stat file");
+		giterr_set(GITERR_OS, "failed to stat file");
 		error = -1;
 		(void)p_close(fd);
 		goto unlock;
 	}
 
 	if (!git__is_sizet(st.st_size)) {
-		git_error_set(GIT_ERROR_INVALID, "unable to load file larger than size_t");
+		giterr_set(GITERR_INVALID, "unable to load file larger than size_t");
 		error = -1;
 		(void)p_close(fd);
 		goto unlock;
@@ -270,20 +270,24 @@ int git_sortedcache_clear(git_sortedcache *sc, bool wlock)
 /* find and/or insert item, returning pointer to item data */
 int git_sortedcache_upsert(void **out, git_sortedcache *sc, const char *key)
 {
-	size_t keylen, itemlen;
 	int error = 0;
-	char *item_key;
+	khiter_t pos;
 	void *item;
+	size_t keylen, itemlen;
+	char *item_key;
 
-	if ((item = git_strmap_get(sc->map, key)) != NULL)
+	pos = git_strmap_lookup_index(sc->map, key);
+	if (git_strmap_valid_index(sc->map, pos)) {
+		item = git_strmap_value_at(sc->map, pos);
 		goto done;
+	}
 
 	keylen  = strlen(key);
 	itemlen = sc->item_path_offset + keylen + 1;
 	itemlen = (itemlen + 7) & ~7;
 
-	if ((item = git_pool_mallocz(&sc->pool, itemlen)) == NULL) {
-		/* don't use GIT_ERROR_CHECK_ALLOC b/c of lock */
+	if ((item = git_pool_mallocz(&sc->pool, (uint32_t)itemlen)) == NULL) {
+		/* don't use GITERR_CHECK_ALLOC b/c of lock */
 		error = -1;
 		goto done;
 	}
@@ -295,11 +299,17 @@ int git_sortedcache_upsert(void **out, git_sortedcache *sc, const char *key)
 	item_key = ((char *)item) + sc->item_path_offset;
 	memcpy(item_key, key, keylen);
 
-	if ((error = git_strmap_set(sc->map, item_key, item)) < 0)
+	pos = git_strmap_put(sc->map, item_key, &error);
+	if (error < 0)
 		goto done;
 
-	if ((error = git_vector_insert(&sc->items, item)) < 0)
-		git_strmap_delete(sc->map, item_key);
+	if (!error)
+		git_strmap_set_key_at(sc->map, pos, item_key);
+	git_strmap_set_value_at(sc->map, pos, item);
+
+	error = git_vector_insert(&sc->items, item);
+	if (error < 0)
+		git_strmap_delete_at(sc->map, pos);
 
 done:
 	if (out)
@@ -310,7 +320,10 @@ done:
 /* lookup item by key */
 void *git_sortedcache_lookup(const git_sortedcache *sc, const char *key)
 {
-	return git_strmap_get(sc->map, key);
+	khiter_t pos = git_strmap_lookup_index(sc->map, key);
+	if (git_strmap_valid_index(sc->map, pos))
+		return git_strmap_value_at(sc->map, pos);
+	return NULL;
 }
 
 /* find out how many items are in the cache */
@@ -358,20 +371,21 @@ int git_sortedcache_lookup_index(
 int git_sortedcache_remove(git_sortedcache *sc, size_t pos)
 {
 	char *item;
+	khiter_t mappos;
 
-	/*
-	 * Because of pool allocation, this can't actually remove the item,
+	/* because of pool allocation, this can't actually remove the item,
 	 * but we can remove it from the items vector and the hash table.
 	 */
 
 	if ((item = git_vector_get(&sc->items, pos)) == NULL) {
-		git_error_set(GIT_ERROR_INVALID, "removing item out of range");
+		giterr_set(GITERR_INVALID, "removing item out of range");
 		return GIT_ENOTFOUND;
 	}
 
 	(void)git_vector_remove(&sc->items, pos);
 
-	git_strmap_delete(sc->map, item + sc->item_path_offset);
+	mappos = git_strmap_lookup_index(sc->map, item + sc->item_path_offset);
+	git_strmap_delete_at(sc->map, mappos);
 
 	if (sc->free_item)
 		sc->free_item(sc->free_item_payload, item);

data/vendor/libgit2/src/sortedcache.h

@@ -10,7 +10,7 @@
 #include "common.h"
 
 #include "util.h"
-#include "futils.h"
+#include "fileops.h"
 #include "vector.h"
 #include "thread-utils.h"
 #include "pool.h"

data/vendor/libgit2/src/stash.c

@@ -12,7 +12,6 @@
 #include "message.h"
 #include "tree.h"
 #include "reflog.h"
-#include "blob.h"
 #include "git2/diff.h"
 #include "git2/stash.h"
 #include "git2/status.h"
@@ -29,7 +28,7 @@
 
 static int create_error(int error, const char *msg)
 {
-	git_error_set(GIT_ERROR_STASH, "cannot stash changes - %s", msg);
+	giterr_set(GITERR_STASH, "cannot stash changes - %s", msg);
 	return error;
 }
 
@@ -48,7 +47,7 @@ static int append_abbreviated_oid(git_buf *out, const git_oid *b_commit)
 	char *formatted_oid;
 
 	formatted_oid = git_oid_allocfmt(b_commit);
-	GIT_ERROR_CHECK_ALLOC(formatted_oid);
+	GITERR_CHECK_ALLOC(formatted_oid);
 
 	git_buf_put(out, formatted_oid, 7);
 	git__free(formatted_oid);
@@ -59,7 +58,7 @@ static int append_abbreviated_oid(git_buf *out, const git_oid *b_commit)
 static int append_commit_description(git_buf *out, git_commit* commit)
 {
 	const char *summary = git_commit_summary(commit);
-	GIT_ERROR_CHECK_ALLOC(summary);
+	GITERR_CHECK_ALLOC(summary);
 
 	if (append_abbreviated_oid(out, git_commit_id(commit)) < 0)
 		return -1;
@@ -104,23 +103,19 @@ cleanup:
 	return error;
 }
 
-static int build_tree_from_index(
-	git_tree **out,
-	git_repository *repo,
-	git_index *index)
+static int build_tree_from_index(git_tree **out, git_index *index)
 {
 	int error;
 	git_oid i_tree_oid;
 
-	if ((error = git_index_write_tree_to(&i_tree_oid, index, repo)) < 0)
+	if ((error = git_index_write_tree(&i_tree_oid, index)) < 0)
 		return error;
 
-	return git_tree_lookup(out, repo, &i_tree_oid);
+	return git_tree_lookup(out, git_index_owner(index), &i_tree_oid);
 }
 
 static int commit_index(
 	git_commit **i_commit,
-	git_repository *repo,
 	git_index *index,
 	const git_signature *stasher,
 	const char *message,
@@ -131,7 +126,7 @@ static int commit_index(
 	git_buf msg = GIT_BUF_INIT;
 	int error;
 
-	if ((error = build_tree_from_index(&i_tree, repo, index)) < 0)
+	if ((error = build_tree_from_index(&i_tree, index)) < 0)
 		goto cleanup;
 
 	if ((error = git_buf_printf(&msg, "index on %s\n", message)) < 0)
@@ -154,7 +149,7 @@ static int commit_index(
 
 cleanup:
 	git_tree_free(i_tree);
-	git_buf_dispose(&msg);
+	git_buf_free(&msg);
 	return error;
 }
 
@@ -164,38 +159,7 @@ struct stash_update_rules {
 	bool include_ignored;
 };
 
-/*
- * Similar to git_index_add_bypath but able to operate on any
- * index without making assumptions about the repository's index
- */
-static int stash_to_index(
-	git_repository *repo,
-	git_index *index,
-	const char *path)
-{
-	git_index *repo_index;
-	git_index_entry entry = {{0}};
-	struct stat st;
-	int error;
-
-	if (!git_repository_is_bare(repo) &&
-	    (error = git_repository_index__weakptr(&repo_index, repo)) < 0)
-		return error;
-
-	if ((error = git_blob__create_from_paths(
-	    &entry.id, &st, repo, NULL, path, 0, true)) < 0)
-		return error;
-
-	git_index_entry__init_from_stat(&entry, &st,
-		(repo_index != NULL || !repo_index->distrust_filemode));
-
-	entry.path = path;
-
-	return git_index_add(index, &entry);
-}
-
 static int stash_update_index_from_diff(
-	git_repository *repo,
 	git_index *index,
 	const git_diff *diff,
 	struct stash_update_rules *data)
@@ -233,15 +197,15 @@ static int stash_update_index_from_diff(
 
 		default:
 			/* Unimplemented */
-			git_error_set(
-				GIT_ERROR_INVALID,
+			giterr_set(
+				GITERR_INVALID,
 				"cannot update index. Unimplemented status (%d)",
 				delta->status);
 			return -1;
 		}
 
 		if (add_path != NULL)
-			error = stash_to_index(repo, index, add_path);
+			error = git_index_add_bypath(index, add_path);
 	}
 
 	return error;
@@ -249,19 +213,17 @@ static int stash_update_index_from_diff(
 
 static int build_untracked_tree(
 	git_tree **tree_out,
-	git_repository *repo,
+	git_index *index,
 	git_commit *i_commit,
 	uint32_t flags)
 {
-	git_index *i_index = NULL;
 	git_tree *i_tree = NULL;
 	git_diff *diff = NULL;
 	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
 	struct stash_update_rules data = {0};
 	int error;
 
-	if ((error = git_index_new(&i_index)) < 0)
-		goto cleanup;
+	git_index_clear(index);
 
 	if (flags & GIT_STASH_INCLUDE_UNTRACKED) {
 		opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED |
@@ -278,24 +240,24 @@ static int build_untracked_tree(
 	if ((error = git_commit_tree(&i_tree, i_commit)) < 0)
 		goto cleanup;
 
-	if ((error = git_diff_tree_to_workdir(&diff, repo, i_tree, &opts)) < 0)
+	if ((error = git_diff_tree_to_workdir(
+			&diff, git_index_owner(index), i_tree, &opts)) < 0)
 		goto cleanup;
 
-	if ((error = stash_update_index_from_diff(repo, i_index, diff, &data)) < 0)
+	if ((error = stash_update_index_from_diff(index, diff, &data)) < 0)
 		goto cleanup;
 
-	error = build_tree_from_index(tree_out, repo, i_index);
+	error = build_tree_from_index(tree_out, index);
 
 cleanup:
 	git_diff_free(diff);
 	git_tree_free(i_tree);
-	git_index_free(i_index);
 	return error;
 }
 
 static int commit_untracked(
 	git_commit **u_commit,
-	git_repository *repo,
+	git_index *index,
 	const git_signature *stasher,
 	const char *message,
 	git_commit *i_commit,
@@ -306,7 +268,7 @@ static int commit_untracked(
 	git_buf msg = GIT_BUF_INIT;
 	int error;
 
-	if ((error = build_untracked_tree(&u_tree, repo, i_commit, flags)) < 0)
+	if ((error = build_untracked_tree(&u_tree, index, i_commit, flags)) < 0)
 		goto cleanup;
 
 	if ((error = git_buf_printf(&msg, "untracked files on %s\n", message)) < 0)
@@ -314,7 +276,7 @@ static int commit_untracked(
 
 	if ((error = git_commit_create(
 		&u_commit_oid,
-		repo,
+		git_index_owner(index),
 		NULL,
 		stasher,
 		stasher,
@@ -325,11 +287,11 @@ static int commit_untracked(
 		NULL)) < 0)
 		goto cleanup;
 
-	error = git_commit_lookup(u_commit, repo, &u_commit_oid);
+	error = git_commit_lookup(u_commit, git_index_owner(index), &u_commit_oid);
 
 cleanup:
 	git_tree_free(u_tree);
-	git_buf_dispose(&msg);
+	git_buf_free(&msg);
 	return error;
 }
 
@@ -354,10 +316,10 @@ static git_diff_delta *stash_delta_merge(
 
 static int build_workdir_tree(
 	git_tree **tree_out,
-	git_repository *repo,
-	git_index *i_index,
+	git_index *index,
 	git_commit *b_commit)
 {
+	git_repository *repo = git_index_owner(index);
 	git_tree *b_tree = NULL;
 	git_diff *diff = NULL, *idx_to_wd = NULL;
 	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
@@ -369,17 +331,17 @@ static int build_workdir_tree(
 	if ((error = git_commit_tree(&b_tree, b_commit)) < 0)
 		goto cleanup;
 
-	if ((error = git_diff_tree_to_index(&diff, repo, b_tree, i_index, &opts)) < 0 ||
-		(error = git_diff_index_to_workdir(&idx_to_wd, repo, i_index, &opts)) < 0 ||
+	if ((error = git_diff_tree_to_index(&diff, repo, b_tree, index, &opts)) < 0 ||
+		(error = git_diff_index_to_workdir(&idx_to_wd, repo, index, &opts)) < 0 ||
 		(error = git_diff__merge(diff, idx_to_wd, stash_delta_merge)) < 0)
 		goto cleanup;
 
 	data.include_changed = true;
 
-	if ((error = stash_update_index_from_diff(repo, i_index, diff, &data)) < 0)
+	if ((error = stash_update_index_from_diff(index, diff, &data)) < 0)
 		goto cleanup;
 
-	error = build_tree_from_index(tree_out, repo, i_index);
+	error = build_tree_from_index(tree_out, index);
 
 cleanup:
 	git_diff_free(idx_to_wd);
@@ -391,36 +353,33 @@ cleanup:
 
 static int commit_worktree(
 	git_oid *w_commit_oid,
-	git_repository *repo,
+	git_index *index,
 	const git_signature *stasher,
 	const char *message,
 	git_commit *i_commit,
 	git_commit *b_commit,
 	git_commit *u_commit)
 {
-	const git_commit *parents[] = {	NULL, NULL, NULL };
-	git_index *i_index = NULL, *r_index = NULL;
-	git_tree *w_tree = NULL;
-	int error = 0, ignorecase;
+	int error = 0;
+	git_tree *w_tree = NULL, *i_tree = NULL;
+	const git_commit *parents[] = {	NULL, NULL,	NULL };
 
 	parents[0] = b_commit;
 	parents[1] = i_commit;
 	parents[2] = u_commit;
 
-	if ((error = git_repository_index(&r_index, repo) < 0) ||
-	    (error = git_index_new(&i_index)) < 0 ||
-	    (error = git_index__fill(i_index, &r_index->entries) < 0) ||
-	    (error = git_repository__configmap_lookup(&ignorecase, repo, GIT_CONFIGMAP_IGNORECASE)) < 0)
+	if ((error = git_commit_tree(&i_tree, i_commit)) < 0)
 		goto cleanup;
 
-	git_index__set_ignore_case(i_index, ignorecase);
+	if ((error = git_index_read_tree(index, i_tree)) < 0)
+		goto cleanup;
 
-	if ((error = build_workdir_tree(&w_tree, repo, i_index, b_commit)) < 0)
+	if ((error = build_workdir_tree(&w_tree, index, b_commit)) < 0)
 		goto cleanup;
 
 	error = git_commit_create(
 		w_commit_oid,
-		repo,
+		git_index_owner(index),
 		NULL,
 		stasher,
 		stasher,
@@ -431,39 +390,41 @@ static int commit_worktree(
 		parents);
 
 cleanup:
+	git_tree_free(i_tree);
 	git_tree_free(w_tree);
-	git_index_free(i_index);
-	git_index_free(r_index);
 	return error;
 }
 
-static int prepare_worktree_commit_message(git_buf *out, const char *user_message)
+static int prepare_worktree_commit_message(
+	git_buf* msg,
+	const char *user_message)
 {
 	git_buf buf = GIT_BUF_INIT;
-	int error = 0;
+	int error;
 
-	if (!user_message) {
-		git_buf_printf(&buf, "WIP on %s", git_buf_cstr(out));
-	} else {
+	if ((error = git_buf_set(&buf, git_buf_cstr(msg), git_buf_len(msg))) < 0)
+		return error;
+
+	git_buf_clear(msg);
+
+	if (!user_message)
+		git_buf_printf(msg, "WIP on %s", git_buf_cstr(&buf));
+	else {
 		const char *colon;
 
-		if ((colon = strchr(git_buf_cstr(out), ':')) == NULL)
+		if ((colon = strchr(git_buf_cstr(&buf), ':')) == NULL)
 			goto cleanup;
 
-		git_buf_puts(&buf, "On ");
-		git_buf_put(&buf, git_buf_cstr(out), colon - out->ptr);
-		git_buf_printf(&buf, ": %s\n", user_message);
-	}
-
-	if (git_buf_oom(&buf)) {
-		error = -1;
-		goto cleanup;
+		git_buf_puts(msg, "On ");
+		git_buf_put(msg, git_buf_cstr(&buf), colon - buf.ptr);
+		git_buf_printf(msg, ": %s\n", user_message);
 	}
 
-	git_buf_swap(out, &buf);
+	error = (git_buf_oom(msg) || git_buf_oom(&buf)) ? -1 : 0;
 
 cleanup:
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
+
 	return error;
 }
 
@@ -494,7 +455,10 @@ static int is_dirty_cb(const char *path, unsigned int status, void *payload)
 	return GIT_PASSTHROUGH;
 }
 
-static int ensure_there_are_changes_to_stash(git_repository *repo, uint32_t flags)
+static int ensure_there_are_changes_to_stash(
+	git_repository *repo,
+	bool include_untracked_files,
+	bool include_ignored_files)
 {
 	int error;
 	git_status_options opts = GIT_STATUS_OPTIONS_INIT;
@@ -502,11 +466,11 @@ static int ensure_there_are_changes_to_stash(git_repository *repo, uint32_t flag
 	opts.show  = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
 	opts.flags = GIT_STATUS_OPT_EXCLUDE_SUBMODULES;
 
-	if (flags & GIT_STASH_INCLUDE_UNTRACKED)
+	if (include_untracked_files)
 		opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED |
 			GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS;
 
-	if (flags & GIT_STASH_INCLUDE_IGNORED)
+	if (include_ignored_files)
 		opts.flags |= GIT_STATUS_OPT_INCLUDE_IGNORED |
 			GIT_STATUS_OPT_RECURSE_IGNORED_DIRS;
 
@@ -521,14 +485,20 @@ static int ensure_there_are_changes_to_stash(git_repository *repo, uint32_t flag
 	return error;
 }
 
-static int reset_index_and_workdir(git_repository *repo, git_commit *commit, uint32_t flags)
+static int reset_index_and_workdir(
+	git_repository *repo,
+	git_commit *commit,
+	bool remove_untracked,
+	bool remove_ignored)
 {
 	git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
 
 	opts.checkout_strategy = GIT_CHECKOUT_FORCE;
-	if (flags & GIT_STASH_INCLUDE_UNTRACKED)
+
+	if (remove_untracked)
 		opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_UNTRACKED;
-	if (flags & GIT_STASH_INCLUDE_IGNORED)
+
+	if (remove_ignored)
 		opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_IGNORED;
 
 	return git_checkout_tree(repo, (git_object *)commit, &opts);
@@ -554,26 +524,31 @@ int git_stash_save(
 	if ((error = retrieve_base_commit_and_message(&b_commit, &msg, repo)) < 0)
 		goto cleanup;
 
-	if ((error = ensure_there_are_changes_to_stash(repo, flags)) < 0)
+	if ((error = ensure_there_are_changes_to_stash(
+		repo,
+		(flags & GIT_STASH_INCLUDE_UNTRACKED) != 0,
+		(flags & GIT_STASH_INCLUDE_IGNORED) != 0)) < 0)
 		goto cleanup;
 
 	if ((error = git_repository_index(&index, repo)) < 0)
 		goto cleanup;
 
-	if ((error = commit_index(&i_commit, repo, index, stasher,
-				  git_buf_cstr(&msg), b_commit)) < 0)
+	if ((error = commit_index(
+			&i_commit, index, stasher, git_buf_cstr(&msg), b_commit)) < 0)
 		goto cleanup;
 
 	if ((flags & (GIT_STASH_INCLUDE_UNTRACKED | GIT_STASH_INCLUDE_IGNORED)) &&
-	    (error = commit_untracked(&u_commit, repo, stasher,
-				      git_buf_cstr(&msg), i_commit, flags)) < 0)
+		(error = commit_untracked(
+			&u_commit, index, stasher, git_buf_cstr(&msg),
+			i_commit, flags)) < 0)
 		goto cleanup;
 
 	if ((error = prepare_worktree_commit_message(&msg, message)) < 0)
 		goto cleanup;
 
-	if ((error = commit_worktree(out, repo, stasher, git_buf_cstr(&msg),
-				     i_commit, b_commit, u_commit)) < 0)
+	if ((error = commit_worktree(
+			out, index, stasher, git_buf_cstr(&msg),
+			i_commit, b_commit, u_commit)) < 0)
 		goto cleanup;
 
 	git_buf_rtrim(&msg);
@@ -581,13 +556,16 @@ int git_stash_save(
 	if ((error = update_reflog(out, repo, git_buf_cstr(&msg))) < 0)
 		goto cleanup;
 
-	if ((error = reset_index_and_workdir(repo, (flags & GIT_STASH_KEEP_INDEX) ? i_commit : b_commit,
-					     flags)) < 0)
+	if ((error = reset_index_and_workdir(
+		repo,
+		((flags & GIT_STASH_KEEP_INDEX) != 0) ? i_commit : b_commit,
+		(flags & GIT_STASH_INCLUDE_UNTRACKED) != 0,
+		(flags & GIT_STASH_INCLUDE_IGNORED) != 0)) < 0)
 		goto cleanup;
 
 cleanup:
 
-	git_buf_dispose(&msg);
+	git_buf_free(&msg);
 	git_commit_free(i_commit);
 	git_commit_free(b_commit);
 	git_commit_free(u_commit);
@@ -616,7 +594,7 @@ static int retrieve_stash_commit(
 	max = git_reflog_entrycount(reflog);
 	if (!max || index > max - 1) {
 		error = GIT_ENOTFOUND;
-		git_error_set(GIT_ERROR_STASH, "no stashed state at position %" PRIuZ, index);
+		giterr_set(GITERR_STASH, "no stashed state at position %" PRIuZ, index);
 		goto cleanup;
 	}
 
@@ -760,7 +738,8 @@ static void normalize_apply_options(
 		memcpy(opts, &default_apply_opts, sizeof(git_stash_apply_options));
 	}
 
-	opts->checkout_options.checkout_strategy |= GIT_CHECKOUT_NO_REFRESH;
+	if ((opts->checkout_options.checkout_strategy & (GIT_CHECKOUT_SAFE | GIT_CHECKOUT_FORCE)) == 0)
+		opts->checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE;
 
 	if (!opts->checkout_options.our_label)
 		opts->checkout_options.our_label = "Updated upstream";
@@ -769,18 +748,13 @@ static void normalize_apply_options(
 		opts->checkout_options.their_label = "Stashed changes";
 }
 
-int git_stash_apply_options_init(git_stash_apply_options *opts, unsigned int version)
+int git_stash_apply_init_options(git_stash_apply_options *opts, unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
 		opts, version, git_stash_apply_options, GIT_STASH_APPLY_OPTIONS_INIT);
 	return 0;
 }
 
-int git_stash_apply_init_options(git_stash_apply_options *opts, unsigned int version)
-{
-	return git_stash_apply_options_init(opts, version);
-}
-
 #define NOTIFY_PROGRESS(opts, progress_type)				\
 	do {								\
 		if ((opts).progress_cb &&				\
@@ -802,7 +776,7 @@ static int ensure_clean_index(git_repository *repo, git_index *index)
 		goto done;
 
 	if (git_diff_num_deltas(index_diff) > 0) {
-		git_error_set(GIT_ERROR_STASH, "%" PRIuZ " uncommitted changes exist in the index",
+		giterr_set(GITERR_STASH, "%" PRIuZ " uncommitted changes exist in the index",
 			git_diff_num_deltas(index_diff));
 		error = GIT_EUNCOMMITTED;
 	}
@@ -874,7 +848,7 @@ int git_stash_apply(
 	git_index *untracked_index = NULL;
 	int error;
 
-	GIT_ERROR_CHECK_VERSION(given_opts, GIT_STASH_APPLY_OPTIONS_VERSION, "git_stash_apply_options");
+	GITERR_CHECK_VERSION(given_opts, GIT_STASH_APPLY_OPTIONS_VERSION, "git_stash_apply_options");
 
 	normalize_apply_options(&opts, given_opts);
 	checkout_strategy = opts.checkout_options.checkout_strategy;
@@ -1007,7 +981,7 @@ int git_stash_foreach(
 
 	error = git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE);
 	if (error == GIT_ENOTFOUND) {
-		git_error_clear();
+		giterr_clear();
 		return 0;
 	}
 	if (error < 0)
@@ -1026,7 +1000,7 @@ int git_stash_foreach(
 			payload);
 
 		if (error) {
-			git_error_set_after_callback(error);
+			giterr_set_after_callback(error);
 			break;
 		}
 	}
@@ -1063,7 +1037,7 @@ int git_stash_drop(
 
 	if (!max || index > max - 1) {
 		error = GIT_ENOTFOUND;
-		git_error_set(GIT_ERROR_STASH, "no stashed state at position %" PRIuZ, index);
+		giterr_set(GITERR_STASH, "no stashed state at position %" PRIuZ, index);
 		goto cleanup;
 	}