rugged 0.27.7 → 0.27.9

data/vendor/libgit2/src/diff_tform.c

@@ -529,7 +529,7 @@ static void similarity_unload(similarity_info *info)
 	if (info->blob)
 		git_blob_free(info->blob);
 	else
-		git_buf_dispose(&info->data);
+		git_buf_free(&info->data);
 }
 
 #define FLAG_SET(opts,flag_name) (((opts)->flags & flag_name) != 0)
@@ -816,13 +816,15 @@ int git_diff_find_similar(
 	diff_find_match *best_match;
 	git_diff_file swap;
 
+	assert(diff);
+
 	if ((error = normalize_find_opts(diff, &opts, given_opts)) < 0)
 		return error;
 
 	num_deltas = diff->deltas.length;
 
 	/* TODO: maybe abort if deltas.length > rename_limit ??? */
-	if (!git__is_uint32(num_deltas))
+	if (!num_deltas || !git__is_uint32(num_deltas))
 		goto cleanup;
 
 	/* No flags set; nothing to do */

data/vendor/libgit2/src/diff_xdiff.c

@@ -6,7 +6,6 @@
  */
 
 #include "diff_xdiff.h"
-#include "util.h"
 
 #include "git2/errors.h"
 #include "diff.h"
@@ -116,7 +115,6 @@ static int git_xdiff_cb(void *priv, mmbuffer_t *bufs, int len)
 	const git_diff_delta *delta = patch->base.delta;
 	git_patch_generated_output *output = &info->xo->output;
 	git_diff_line line;
-	size_t buffer_len;
 
 	if (len == 1) {
 		output->error = git_xdiff_parse_hunk(&info->hunk, bufs[0].ptr);
@@ -126,16 +124,6 @@ static int git_xdiff_cb(void *priv, mmbuffer_t *bufs, int len)
 		info->hunk.header_len = bufs[0].size;
 		if (info->hunk.header_len >= sizeof(info->hunk.header))
 			info->hunk.header_len = sizeof(info->hunk.header) - 1;
-
-		/* Sanitize the hunk header in case there is invalid Unicode */
-		buffer_len = git__utf8_valid_buf_length((const uint8_t *) bufs[0].ptr, info->hunk.header_len);
-		/* Sanitizing the hunk header may delete the newline, so add it back again if there is room */
-		if (buffer_len < info->hunk.header_len) {
-			bufs[0].ptr[buffer_len] = '\n';
-			buffer_len += 1;
-			info->hunk.header_len = buffer_len;
-		}
-
 		memcpy(info->hunk.header, bufs[0].ptr, info->hunk.header_len);
 		info->hunk.header[info->hunk.header_len] = '\0';
 

data/vendor/libgit2/src/features.h.in

@@ -27,12 +27,10 @@
 #cmakedefine GIT_HTTPS 1
 #cmakedefine GIT_OPENSSL 1
 #cmakedefine GIT_SECURE_TRANSPORT 1
-#cmakedefine GIT_MBEDTLS 1
 
 #cmakedefine GIT_SHA1_COLLISIONDETECT 1
 #cmakedefine GIT_SHA1_WIN32 1
 #cmakedefine GIT_SHA1_COMMON_CRYPTO 1
 #cmakedefine GIT_SHA1_OPENSSL 1
-#cmakedefine GIT_SHA1_MBEDTLS 1
 
 #endif

data/vendor/libgit2/src/fetch.c

@@ -78,7 +78,7 @@ static int filter_wants(git_remote *remote, const git_fetch_options *opts)
 			goto cleanup;
 
 		error = git_refspec__dwim_one(&remote->active_refspecs, &head, &remote->refs);
-		git_refspec__dispose(&head);
+		git_refspec__free(&head);
 
 		if (error < 0)
 			goto cleanup;
@@ -96,7 +96,7 @@ static int filter_wants(git_remote *remote, const git_fetch_options *opts)
 	}
 
 cleanup:
-	git_refspec__dispose(&tagspec);
+	git_refspec__free(&tagspec);
 
 	return error;
 }

data/vendor/libgit2/src/fetchhead.c

@@ -119,11 +119,11 @@ int git_fetchhead_write(git_repository *repo, git_vector *fetchhead_refs)
 		return -1;
 
 	if (git_filebuf_open(&file, path.ptr, GIT_FILEBUF_APPEND, GIT_REFS_FILE_MODE) < 0) {
-		git_buf_dispose(&path);
+		git_buf_free(&path);
 		return -1;
 	}
 
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	git_vector_sort(fetchhead_refs);
 
@@ -283,9 +283,9 @@ int git_repository_fetchhead_foreach(git_repository *repo,
 	}
 
 done:
-	git_buf_dispose(&file);
-	git_buf_dispose(&path);
-	git_buf_dispose(&name);
+	git_buf_free(&file);
+	git_buf_free(&path);
+	git_buf_free(&name);
 
 	return error;
 }

data/vendor/libgit2/src/filebuf.c

@@ -256,7 +256,7 @@ static int resolve_symlink(git_buf *out, const char *path)
 				goto cleanup;
 
 			git_buf_swap(&curpath, &dir);
-			git_buf_dispose(&dir);
+			git_buf_free(&dir);
 
 			if ((error = git_path_apply_relative(&curpath, target.ptr)) < 0)
 				goto cleanup;
@@ -267,8 +267,8 @@ static int resolve_symlink(git_buf *out, const char *path)
 	error = -1;
 
 cleanup:
-	git_buf_dispose(&curpath);
-	git_buf_dispose(&target);
+	git_buf_free(&curpath);
+	git_buf_free(&target);
 	return error;
 }
 
@@ -343,7 +343,7 @@ int git_filebuf_open_withsize(git_filebuf *file, const char *path, int flags, mo
 		file->fd = git_futils_mktmp(&tmp_path, path, mode);
 
 		if (file->fd < 0) {
-			git_buf_dispose(&tmp_path);
+			git_buf_free(&tmp_path);
 			goto cleanup;
 		}
 		file->fd_is_open = true;

data/vendor/libgit2/src/fileops.c

@@ -159,7 +159,7 @@ int git_futils_readbuffer_fd(git_buf *buf, git_file fd, size_t len)
 
 	if (read_size != (ssize_t)len) {
 		giterr_set(GITERR_OS, "failed to read descriptor");
-		git_buf_dispose(buf);
+		git_buf_free(buf);
 		return -1;
 	}
 
@@ -209,7 +209,7 @@ int git_futils_readbuffer_updated(
 
 	if (checksum) {
 		if ((error = git_hash_buf(&checksum_new, buf.ptr, buf.size)) < 0) {
-			git_buf_dispose(&buf);
+			git_buf_free(&buf);
 			return error;
 		}
 
@@ -217,7 +217,7 @@ int git_futils_readbuffer_updated(
 		 * If we were given a checksum, we only want to use it if it's different
 		 */
 		if (!git_oid__cmp(checksum, &checksum_new)) {
-			git_buf_dispose(&buf);
+			git_buf_free(&buf);
 			if (updated)
 				*updated = 0;
 
@@ -234,7 +234,7 @@ int git_futils_readbuffer_updated(
 		*updated = 1;
 
 	git_buf_swap(out, &buf);
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	return 0;
 }
@@ -526,8 +526,8 @@ int git_futils_mkdir(
 		parent_path.size ? parent_path.ptr : NULL, mode, flags, &opts);
 
 done:
-	git_buf_dispose(&make_path);
-	git_buf_dispose(&parent_path);
+	git_buf_free(&make_path);
+	git_buf_free(&parent_path);
 	return error;
 }
 
@@ -661,7 +661,7 @@ retry_lstat:
 	}
 
 done:
-	git_buf_dispose(&make_path);
+	git_buf_free(&make_path);
 	return error;
 }
 
@@ -822,7 +822,7 @@ int git_futils_rmdir_r(
 		error = 0;
 	}
 
-	git_buf_dispose(&fullpath);
+	git_buf_free(&fullpath);
 
 	return error;
 }
@@ -1081,8 +1081,8 @@ int git_futils_cp_r(
 
 	error = _cp_r_callback(&info, &path);
 
-	git_buf_dispose(&path);
-	git_buf_dispose(&info.to);
+	git_buf_free(&path);
+	git_buf_free(&info.to);
 
 	return error;
 }

data/vendor/libgit2/src/filter.c

@@ -809,6 +809,7 @@ static int proxy_stream_close(git_writestream *s)
 {
 	struct proxy_stream *proxy_stream = (struct proxy_stream *)s;
 	git_buf *writebuf;
+	git_error_state error_state = {0};
 	int error;
 
 	assert(proxy_stream);
@@ -826,6 +827,11 @@ static int proxy_stream_close(git_writestream *s)
 		git_buf_sanitize(proxy_stream->output);
 		writebuf = proxy_stream->output;
 	} else {
+		/* close stream before erroring out taking care
+		 * to preserve the original error */
+		giterr_state_capture(&error_state, error);
+		proxy_stream->target->close(proxy_stream->target);
+		giterr_state_restore(&error_state);
 		return error;
 	}
 
@@ -841,8 +847,8 @@ static void proxy_stream_free(git_writestream *s)
 	struct proxy_stream *proxy_stream = (struct proxy_stream *)s;
 	assert(proxy_stream);
 
-	git_buf_dispose(&proxy_stream->input);
-	git_buf_dispose(&proxy_stream->temp_buf);
+	git_buf_free(&proxy_stream->input);
+	git_buf_free(&proxy_stream->temp_buf);
 	git__free(proxy_stream);
 }
 
@@ -977,7 +983,7 @@ done:
 	if (fd >= 0)
 		p_close(fd);
 	stream_list_free(&filter_streams);
-	git_buf_dispose(&abspath);
+	git_buf_free(&abspath);
 	return error;
 }
 

data/vendor/libgit2/src/global.c

@@ -7,13 +7,11 @@
 
 #include "global.h"
 
-#include "alloc.h"
 #include "hash.h"
 #include "sysdir.h"
 #include "filter.h"
 #include "merge_driver.h"
 #include "streams/curl.h"
-#include "streams/mbedtls.h"
 #include "streams/openssl.h"
 #include "thread-utils.h"
 #include "git2/global.h"
@@ -61,15 +59,13 @@ static int init_common(void)
 #endif
 
 	/* Initialize any other subsystems that have global state */
-	if ((ret = git_allocator_global_init()) == 0 &&
-		(ret = git_hash_global_init()) == 0 &&
+	if ((ret = git_hash_global_init()) == 0 &&
 		(ret = git_sysdir_global_init()) == 0 &&
 		(ret = git_filter_global_init()) == 0 &&
 		(ret = git_merge_driver_global_init()) == 0 &&
 		(ret = git_transport_ssh_global_init()) == 0 &&
 		(ret = git_openssl_stream_global_init()) == 0 &&
-		(ret = git_curl_stream_global_init()) == 0 &&
-		(ret = git_mbedtls_stream_global_init()) == 0)
+		(ret = git_curl_stream_global_init()) == 0)
 		ret = git_mwindow_global_init();
 
 	GIT_MEMORY_BARRIER;
@@ -278,10 +274,10 @@ int git_libgit2_init(void)
 {
 	int ret, err;
 
+	ret = git_atomic_inc(&git__n_inits);
+
 	if ((err = pthread_mutex_lock(&_init_mutex)) != 0)
 		return err;
-
-	ret = git_atomic_inc(&git__n_inits);
 	err = pthread_once(&_once_init, init_once);
 	err |= pthread_mutex_unlock(&_init_mutex);
 
@@ -295,13 +291,13 @@ int git_libgit2_shutdown(void)
 {
 	void *ptr = NULL;
 	pthread_once_t new_once = PTHREAD_ONCE_INIT;
-	int error, ret;
-
-	if ((error = pthread_mutex_lock(&_init_mutex)) != 0)
-		return error;
+	int ret;
 
 	if ((ret = git_atomic_dec(&git__n_inits)) != 0)
-		goto out;
+		return ret;
+
+	if ((ret = pthread_mutex_lock(&_init_mutex)) != 0)
+		return ret;
 
 	/* Shut down any subsystems that have global state */
 	shutdown_common();
@@ -316,11 +312,10 @@ int git_libgit2_shutdown(void)
 	git_mutex_free(&git__mwindow_mutex);
 	_once_init = new_once;
 
-out:
-	if ((error = pthread_mutex_unlock(&_init_mutex)) != 0)
-		return error;
+	if ((ret = pthread_mutex_unlock(&_init_mutex)) != 0)
+		return ret;
 
-	return ret;
+	return 0;
 }
 
 git_global_st *git__global_state(void)

data/vendor/libgit2/src/hash.h

@@ -26,8 +26,6 @@ void git_hash_ctx_cleanup(git_hash_ctx *ctx);
 # include "hash/hash_openssl.h"
 #elif defined(GIT_SHA1_WIN32)
 # include "hash/hash_win32.h"
-#elif defined(GIT_SHA1_MBEDTLS)
-# include "hash/hash_mbedtls.h"
 #else
 # include "hash/hash_generic.h"
 #endif

data/vendor/libgit2/src/ignore.c

@@ -158,7 +158,7 @@ static int does_negate_rule(int *out, git_vector *rules, git_attr_fnmatch *match
 
 out:
 	git__free(path);
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 	return error;
 }
 
@@ -315,7 +315,7 @@ int git_ignore__for_path(
 		    (error = git_path_to_dir(&local)) < 0 ||
 		    (error = git_buf_joinpath(&ignores->dir, workdir, local.ptr)) < 0)
 		{;} /* Nothing, we just want to stop on the first error */
-		git_buf_dispose(&local);
+		git_buf_free(&local);
 	} else {
 		error = git_buf_joinpath(&ignores->dir, path, "");
 	}
@@ -355,7 +355,7 @@ int git_ignore__for_path(
 			git_repository_attr_cache(repo)->cfg_excl_file);
 
 cleanup:
-	git_buf_dispose(&infopath);
+	git_buf_free(&infopath);
 	if (error < 0)
 		git_ignore__free(ignores);
 
@@ -427,7 +427,7 @@ void git_ignore__free(git_ignores *ignores)
 	}
 	git_vector_free(&ignores->ign_global);
 
-	git_buf_dispose(&ignores->dir);
+	git_buf_free(&ignores->dir);
 }
 
 static bool ignore_lookup_in_rules(
@@ -632,7 +632,7 @@ int git_ignore__check_pathspec_for_exact_ignores(
 	}
 
 	git_index_free(idx);
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	return error;
 }

data/vendor/libgit2/src/index.c

@@ -135,8 +135,6 @@ struct reuc_entry_internal {
 	char path[GIT_FLEX_ARRAY];
 };
 
-bool git_index__enforce_unsaved_safety = false;
-
 /* local declarations */
 static size_t read_extension(git_index *index, const char *buffer, size_t buffer_size);
 static int read_header(struct index_header *dest, const void *buffer);
@@ -518,8 +516,6 @@ static int index_remove_entry(git_index *index, size_t pos)
 		} else {
 			index_entry_free(entry);
 		}
-
-		index->dirty = 1;
 	}
 
 	return error;
@@ -531,7 +527,6 @@ int git_index_clear(git_index *index)
 
 	assert(index);
 
-	index->dirty = 1;
 	index->tree = NULL;
 	git_pool_clear(&index->tree_pool);
 
@@ -642,10 +637,8 @@ int git_index_read(git_index *index, int force)
 	index->on_disk = git_path_exists(index->index_file_path);
 
 	if (!index->on_disk) {
-		if (force && (error = git_index_clear(index)) < 0)
-			return error;
-
-		index->dirty = 0;
+		if (force)
+			return git_index_clear(index);
 		return 0;
 	}
 
@@ -657,7 +650,6 @@ int git_index_read(git_index *index, int force)
 			index->index_file_path);
 		return updated;
 	}
-
 	if (!updated && !force)
 		return 0;
 
@@ -673,26 +665,13 @@ int git_index_read(git_index *index, int force)
 	if (!error)
 		error = parse_index(index, buffer.ptr, buffer.size);
 
-	if (!error) {
+	if (!error)
 		git_futils_filestamp_set(&index->stamp, &stamp);
-		index->dirty = 0;
-	}
 
-	git_buf_dispose(&buffer);
+	git_buf_free(&buffer);
 	return error;
 }
 
-int git_index_read_safely(git_index *index)
-{
-	if (git_index__enforce_unsaved_safety && index->dirty) {
-		giterr_set(GITERR_INDEX,
-			"the index has unsaved changes that would be overwritten by this operation");
-		return GIT_EINDEXDIRTY;
-	}
-
-	return git_index_read(index, false);
-}
-
 int git_index__changed_relative_to(
 	git_index *index, const git_oid *checksum)
 {
@@ -756,10 +735,8 @@ static int truncate_racily_clean(git_index *index)
 		/* Ensure that we have a stage 0 for this file (ie, it's not a
 		 * conflict), otherwise smudging it is quite pointless.
 		 */
-		if (entry) {
+		if (entry)
 			entry->file_size = 0;
-			index->dirty = 1;
-		}
 	}
 
 done:
@@ -797,9 +774,8 @@ int git_index_write(git_index *index)
 
 	truncate_racily_clean(index);
 
-	if ((error = git_indexwriter_init(&writer, index)) == 0 &&
-		(error = git_indexwriter_commit(&writer)) == 0)
-		index->dirty = 0;
+	if ((error = git_indexwriter_init(&writer, index)) == 0)
+		error = git_indexwriter_commit(&writer);
 
 	git_indexwriter_cleanup(&writer);
 
@@ -973,7 +949,7 @@ static int index_entry_init(
 		return -1;
 
 	error = git_path_lstat(path.ptr, &st);
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	if (error < 0)
 		return error;
@@ -1413,8 +1389,6 @@ static int index_insert(
 	if (error < 0) {
 		index_entry_free(*entry_ptr);
 		*entry_ptr = NULL;
-	} else {
-		index->dirty = 1;
 	}
 
 	return error;
@@ -1535,7 +1509,7 @@ static int add_repo_as_submodule(git_index_entry **out, git_index *index, const
 
 	git_reference_free(head);
 	git_repository_free(sub);
-	git_buf_dispose(&abspath);
+	git_buf_free(&abspath);
 
 	*out = entry;
 	return 0;
@@ -1642,8 +1616,6 @@ int git_index__fill(git_index *index, const git_vector *source_entries)
 		INSERT_IN_MAP(index, entry, &ret);
 		if (ret < 0)
 			break;
-
-		index->dirty = 1;
 	}
 
 	if (!ret)
@@ -1721,7 +1693,7 @@ int git_index_remove_directory(git_index *index, const char *dir, int stage)
 		/* removed entry at 'pos' so we don't need to increment */
 	}
 
-	git_buf_dispose(&pfx);
+	git_buf_free(&pfx);
 
 	return error;
 }
@@ -1802,7 +1774,8 @@ int git_index_conflict_add(git_index *index,
 		if (entries[i] && !valid_filemode(entries[i]->mode)) {
 			giterr_set(GITERR_INDEX, "invalid filemode for stage %d entry",
 				i + 1);
-			return -1;
+			ret = -1;
+			goto on_error;
 		}
 	}
 
@@ -2081,7 +2054,6 @@ int git_index_name_add(git_index *index,
 		return -1;
 	}
 
-	index->dirty = 1;
 	return 0;
 }
 
@@ -2096,8 +2068,6 @@ void git_index_name_clear(git_index *index)
 		index_name_entry_free(conflict_name);
 
 	git_vector_clear(&index->names);
-
-	index->dirty = 1;
 }
 
 size_t git_index_reuc_entrycount(git_index *index)
@@ -2123,8 +2093,6 @@ static int index_reuc_insert(
 	assert(git_vector_is_sorted(&index->reuc));
 
 	res = git_vector_insert_sorted(&index->reuc, reuc, &index_reuc_on_dup);
-	index->dirty = 1;
-
 	return res == GIT_EEXISTS ? 0 : res;
 }
 
@@ -2190,7 +2158,6 @@ int git_index_reuc_remove(git_index *index, size_t position)
 	if (!error)
 		index_entry_reuc_free(reuc);
 
-	index->dirty = 1;
 	return error;
 }
 
@@ -2204,8 +2171,6 @@ void git_index_reuc_clear(git_index *index)
 		index_entry_reuc_free(git__swap(index->reuc.contents[i], NULL));
 
 	git_vector_clear(&index->reuc);
-
-	index->dirty = 1;
 }
 
 static int index_error_invalid(const char *message)
@@ -2242,7 +2207,7 @@ static int read_reuc(git_index *index, const char *buffer, size_t size)
 		for (i = 0; i < 3; i++) {
 			int64_t tmp;
 
-			if (git__strtol64(&tmp, buffer, &endptr, 8) < 0 ||
+			if (git__strntol64(&tmp, buffer, size, &endptr, 8) < 0 ||
 				!endptr || endptr == buffer || *endptr ||
 				tmp < 0 || tmp > UINT32_MAX) {
 				index_entry_reuc_free(lost);
@@ -2640,7 +2605,6 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size)
 	git_vector_set_sorted(&index->entries, !index->ignore_case);
 	git_vector_sort(&index->entries);
 
-	index->dirty = 0;
 done:
 	return error;
 }
@@ -2666,7 +2630,7 @@ static bool is_index_extended(git_index *index)
 static int write_disk_entry(git_filebuf *file, git_index_entry *entry, const char *last)
 {
 	void *mem = NULL;
-	struct entry_short ondisk;
+	struct entry_short *ondisk;
 	size_t path_len, disk_size;
 	int varint_len = 0;
 	char *path;
@@ -2694,7 +2658,9 @@ static int write_disk_entry(git_filebuf *file, git_index_entry *entry, const cha
 	if (git_filebuf_reserve(file, &mem, disk_size) < 0)
 		return -1;
 
-	memset(mem, 0x0, disk_size);
+	ondisk = (struct entry_short *)mem;
+
+	memset(ondisk, 0x0, disk_size);
 
 	/**
 	 * Yes, we have to truncate.
@@ -2706,32 +2672,30 @@ static int write_disk_entry(git_filebuf *file, git_index_entry *entry, const cha
 	 *
 	 * In 2038 I will be either too dead or too rich to care about this
 	 */
-	ondisk.ctime.seconds = htonl((uint32_t)entry->ctime.seconds);
-	ondisk.mtime.seconds = htonl((uint32_t)entry->mtime.seconds);
-	ondisk.ctime.nanoseconds = htonl(entry->ctime.nanoseconds);
-	ondisk.mtime.nanoseconds = htonl(entry->mtime.nanoseconds);
-	ondisk.dev = htonl(entry->dev);
-	ondisk.ino = htonl(entry->ino);
-	ondisk.mode = htonl(entry->mode);
-	ondisk.uid = htonl(entry->uid);
-	ondisk.gid = htonl(entry->gid);
-	ondisk.file_size = htonl((uint32_t)entry->file_size);
+	ondisk->ctime.seconds = htonl((uint32_t)entry->ctime.seconds);
+	ondisk->mtime.seconds = htonl((uint32_t)entry->mtime.seconds);
+	ondisk->ctime.nanoseconds = htonl(entry->ctime.nanoseconds);
+	ondisk->mtime.nanoseconds = htonl(entry->mtime.nanoseconds);
+	ondisk->dev = htonl(entry->dev);
+	ondisk->ino = htonl(entry->ino);
+	ondisk->mode = htonl(entry->mode);
+	ondisk->uid = htonl(entry->uid);
+	ondisk->gid = htonl(entry->gid);
+	ondisk->file_size = htonl((uint32_t)entry->file_size);
 
-	git_oid_cpy(&ondisk.oid, &entry->id);
+	git_oid_cpy(&ondisk->oid, &entry->id);
 
-	ondisk.flags = htons(entry->flags);
+	ondisk->flags = htons(entry->flags);
 
 	if (entry->flags & GIT_IDXENTRY_EXTENDED) {
-		struct entry_long ondisk_ext;
-		memcpy(&ondisk_ext, &ondisk, sizeof(struct entry_short));
-		ondisk_ext.flags_extended = htons(entry->flags_extended &
+		struct entry_long *ondisk_ext;
+		ondisk_ext = (struct entry_long *)ondisk;
+		ondisk_ext->flags_extended = htons(entry->flags_extended &
 			GIT_IDXENTRY_EXTENDED_FLAGS);
-		memcpy(mem, &ondisk_ext, offsetof(struct entry_long, path));
-		path = ((struct entry_long*)mem)->path;
+		path = ondisk_ext->path;
 		disk_size -= offsetof(struct entry_long, path);
 	} else {
-		memcpy(mem, &ondisk, offsetof(struct entry_short, path));
-		path = ((struct entry_short*)mem)->path;
+		path = ondisk->path;
 		disk_size -= offsetof(struct entry_short, path);
 	}
 
@@ -2856,7 +2820,7 @@ static int write_name_extension(git_index *index, git_filebuf *file)
 
 	error = write_extension(file, &extension, &name_buf);
 
-	git_buf_dispose(&name_buf);
+	git_buf_free(&name_buf);
 
 done:
 	return error;
@@ -2904,7 +2868,7 @@ static int write_reuc_extension(git_index *index, git_filebuf *file)
 
 	error = write_extension(file, &extension, &reuc_buf);
 
-	git_buf_dispose(&reuc_buf);
+	git_buf_free(&reuc_buf);
 
 done:
 	return error;
@@ -2928,7 +2892,7 @@ static int write_tree_extension(git_index *index, git_filebuf *file)
 
 	error = write_extension(file, &extension, &buf);
 
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	return error;
 }
@@ -3045,7 +3009,7 @@ static int read_tree_cb(
 	}
 
 	index_entry_adjust_namemask(entry, path.size);
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	if (git_vector_insert(data->new_entries, entry) < 0) {
 		index_entry_free(entry);
@@ -3107,8 +3071,6 @@ int git_index_read_tree(git_index *index, const git_tree *tree)
 		entries_map = git__swap(index->entries_map, entries_map);
 	}
 
-	index->dirty = 1;
-
 cleanup:
 	git_vector_free(&entries);
 	git_idxmap_free(entries_map);
@@ -3248,7 +3210,6 @@ static int git_index_read_iterator(
 
 	clear_uptodate(index);
 
-	index->dirty = 1;
 	error = 0;
 
 done:
@@ -3503,7 +3464,7 @@ static int index_apply_to_all(
 		}
 	}
 
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 	git_pathspec__clear(&ps);
 
 	return error;
@@ -3549,7 +3510,7 @@ int git_index_snapshot_new(git_vector *snap, git_index *index)
 	error = git_vector_dup(snap, &index->entries, index->entries._cmp);
 
 	if (error < 0)
-		git_index_free(index);
+		git_index_snapshot_release(snap, index);
 
 	return error;
 }
@@ -3641,7 +3602,6 @@ int git_indexwriter_commit(git_indexwriter *writer)
 		return -1;
 	}
 
-	writer->index->dirty = 0;
 	writer->index->on_disk = 1;
 	git_oid_cpy(&writer->index->checksum, &checksum);