rugged 1.7.2 → 1.9.0

data/vendor/libgit2/src/libgit2/merge.c

@@ -32,7 +32,6 @@
 #include "commit.h"
 #include "oidarray.h"
 #include "merge_driver.h"
-#include "oidmap.h"
 #include "array.h"
 
 #include "git2/types.h"
@@ -124,11 +123,11 @@ static int merge_bases_many(git_commit_list **out, git_revwalk **walk_out, git_r
 	*out = result;
 	*walk_out = walk;
 
-	git_vector_free(&list);
+	git_vector_dispose(&list);
 	return 0;
 
 on_error:
-	git_vector_free(&list);
+	git_vector_dispose(&list);
 	git_revwalk_free(walk);
 	return error;
 }
@@ -511,7 +510,7 @@ static int remove_redundant(git_revwalk *walk, git_vector *commits, uint32_t min
 done:
 	git__free(redundant);
 	git__free(filled_index);
-	git_vector_free(&work);
+	git_vector_dispose(&work);
 	return error;
 }
 
@@ -570,7 +569,7 @@ int git_merge__bases_many(
 		if ((error = clear_commit_marks(one, ALL_FLAGS)) < 0 ||
 		    (error = clear_commit_marks_many(twos, ALL_FLAGS)) < 0 ||
 		    (error = remove_redundant(walk, &redundant, minimum_generation)) < 0) {
-			git_vector_free(&redundant);
+			git_vector_dispose(&redundant);
 			return error;
 		}
 
@@ -579,7 +578,7 @@ int git_merge__bases_many(
 				git_commit_list_insert_by_date(two, &result);
 		}
 
-		git_vector_free(&redundant);
+		git_vector_dispose(&redundant);
 	}
 
 	*out = result;
@@ -1144,24 +1143,28 @@ typedef struct {
 	size_t first_entry;
 } deletes_by_oid_queue;
 
-static void deletes_by_oid_free(git_oidmap *map) {
+GIT_HASHMAP_OID_SETUP(git_merge_deletes_oidmap, deletes_by_oid_queue *);
+
+static void deletes_by_oid_dispose(git_merge_deletes_oidmap *map)
+{
+	git_hashmap_iter_t iter = GIT_HASHMAP_ITER_INIT;
 	deletes_by_oid_queue *queue;
 
 	if (!map)
 		return;
 
-	git_oidmap_foreach_value(map, queue, {
+	while (git_merge_deletes_oidmap_iterate(&iter, NULL, &queue, map) == 0)
 		git_array_clear(queue->arr);
-	});
-	git_oidmap_free(map);
+
+	git_merge_deletes_oidmap_dispose(map);
 }
 
-static int deletes_by_oid_enqueue(git_oidmap *map, git_pool *pool, const git_oid *id, size_t idx)
+static int deletes_by_oid_enqueue(git_merge_deletes_oidmap *map, git_pool *pool, const git_oid *id, size_t idx)
 {
 	deletes_by_oid_queue *queue;
 	size_t *array_entry;
 
-	if ((queue = git_oidmap_get(map, id)) == NULL) {
+	if (git_merge_deletes_oidmap_get(&queue, map, id) != 0) {
 		queue = git_pool_malloc(pool, sizeof(deletes_by_oid_queue));
 		GIT_ERROR_CHECK_ALLOC(queue);
 
@@ -1169,7 +1172,7 @@ static int deletes_by_oid_enqueue(git_oidmap *map, git_pool *pool, const git_oid
 		queue->next_pos = 0;
 		queue->first_entry = idx;
 
-		if (git_oidmap_set(map, id, queue) < 0)
+		if (git_merge_deletes_oidmap_put(map, id, queue) < 0)
 			return -1;
 	} else {
 		array_entry = git_array_alloc(queue->arr);
@@ -1180,13 +1183,14 @@ static int deletes_by_oid_enqueue(git_oidmap *map, git_pool *pool, const git_oid
 	return 0;
 }
 
-static int deletes_by_oid_dequeue(size_t *idx, git_oidmap *map, const git_oid *id)
+static int deletes_by_oid_dequeue(size_t *idx, git_merge_deletes_oidmap *map, const git_oid *id)
 {
 	deletes_by_oid_queue *queue;
 	size_t *array_entry;
+	int error;
 
-	if ((queue = git_oidmap_get(map, id)) == NULL)
-		return GIT_ENOTFOUND;
+	if ((error = git_merge_deletes_oidmap_get(&queue, map, id)) != 0)
+		return error;
 
 	if (queue->next_pos == 0) {
 		*idx = queue->first_entry;
@@ -1209,15 +1213,10 @@ static int merge_diff_mark_similarity_exact(
 {
 	size_t i, j;
 	git_merge_diff *conflict_src, *conflict_tgt;
-	git_oidmap *ours_deletes_by_oid = NULL, *theirs_deletes_by_oid = NULL;
+	git_merge_deletes_oidmap ours_deletes_by_oid = GIT_HASHMAP_INIT,
+	                         theirs_deletes_by_oid = GIT_HASHMAP_INIT;
 	int error = 0;
 
-	if (git_oidmap_new(&ours_deletes_by_oid) < 0 ||
-	    git_oidmap_new(&theirs_deletes_by_oid) < 0) {
-		error = -1;
-		goto done;
-	}
-
 	/* Build a map of object ids to conflicts */
 	git_vector_foreach(&diff_list->conflicts, i, conflict_src) {
 		/* Items can be the source of a rename iff they have an item in the
@@ -1225,14 +1224,21 @@ static int merge_diff_mark_similarity_exact(
 		if (!GIT_MERGE_INDEX_ENTRY_EXISTS(conflict_src->ancestor_entry))
 			continue;
 
+		/*
+		 * Ignore empty files because it has always the same blob sha1
+		 * and will lead to incorrect matches between all entries.
+		 */
+		if (git_oid_equal(&conflict_src->ancestor_entry.id, &git_oid__empty_blob_sha1))
+			continue;
+
 		if (!GIT_MERGE_INDEX_ENTRY_EXISTS(conflict_src->our_entry)) {
-			error = deletes_by_oid_enqueue(ours_deletes_by_oid, &diff_list->pool, &conflict_src->ancestor_entry.id, i);
+			error = deletes_by_oid_enqueue(&ours_deletes_by_oid, &diff_list->pool, &conflict_src->ancestor_entry.id, i);
 			if (error < 0)
 				goto done;
 		}
 
 		if (!GIT_MERGE_INDEX_ENTRY_EXISTS(conflict_src->their_entry)) {
-			error = deletes_by_oid_enqueue(theirs_deletes_by_oid, &diff_list->pool, &conflict_src->ancestor_entry.id, i);
+			error = deletes_by_oid_enqueue(&theirs_deletes_by_oid, &diff_list->pool, &conflict_src->ancestor_entry.id, i);
 			if (error < 0)
 				goto done;
 		}
@@ -1243,7 +1249,7 @@ static int merge_diff_mark_similarity_exact(
 			continue;
 
 		if (GIT_MERGE_INDEX_ENTRY_EXISTS(conflict_tgt->our_entry)) {
-			if (deletes_by_oid_dequeue(&i, ours_deletes_by_oid, &conflict_tgt->our_entry.id) == 0) {
+			if (deletes_by_oid_dequeue(&i, &ours_deletes_by_oid, &conflict_tgt->our_entry.id) == 0) {
 				similarity_ours[i].similarity = 100;
 				similarity_ours[i].other_idx = j;
 
@@ -1253,7 +1259,7 @@ static int merge_diff_mark_similarity_exact(
 		}
 
 		if (GIT_MERGE_INDEX_ENTRY_EXISTS(conflict_tgt->their_entry)) {
-			if (deletes_by_oid_dequeue(&i, theirs_deletes_by_oid, &conflict_tgt->their_entry.id) == 0) {
+			if (deletes_by_oid_dequeue(&i, &theirs_deletes_by_oid, &conflict_tgt->their_entry.id) == 0) {
 				similarity_theirs[i].similarity = 100;
 				similarity_theirs[i].other_idx = j;
 
@@ -1264,8 +1270,8 @@ static int merge_diff_mark_similarity_exact(
 	}
 
 done:
-	deletes_by_oid_free(ours_deletes_by_oid);
-	deletes_by_oid_free(theirs_deletes_by_oid);
+	deletes_by_oid_dispose(&ours_deletes_by_oid);
+	deletes_by_oid_dispose(&theirs_deletes_by_oid);
 
 	return error;
 }
@@ -1859,9 +1865,9 @@ void git_merge_diff_list__free(git_merge_diff_list *diff_list)
 	if (!diff_list)
 		return;
 
-	git_vector_free(&diff_list->staged);
-	git_vector_free(&diff_list->conflicts);
-	git_vector_free(&diff_list->resolved);
+	git_vector_dispose(&diff_list->staged);
+	git_vector_dispose(&diff_list->conflicts);
+	git_vector_dispose(&diff_list->resolved);
 	git_pool_clear(&diff_list->pool);
 	git__free(diff_list);
 }
@@ -2829,7 +2835,7 @@ cleanup:
 
 	git_str_dispose(&file_path);
 
-	git_vector_free(&matching);
+	git_vector_dispose(&matching);
 	git__free(entries);
 
 	return error;
@@ -3008,7 +3014,7 @@ done:
 	git_iterator_free(iter_new);
 	git_diff_free(staged_diff_list);
 	git_diff_free(index_diff_list);
-	git_vector_free(&staged_paths);
+	git_vector_dispose(&staged_paths);
 
 	return error;
 }
@@ -3105,7 +3111,7 @@ int git_merge__check_result(git_repository *repo, git_index *index_new)
 	}
 
 done:
-	git_vector_free(&paths);
+	git_vector_dispose(&paths);
 	git_tree_free(head_tree);
 	git_iterator_free(iter_head);
 	git_iterator_free(iter_new);
@@ -3346,8 +3352,7 @@ int git_merge(
 		goto done;
 
 	checkout_strategy = given_checkout_opts ?
-		given_checkout_opts->checkout_strategy :
-		GIT_CHECKOUT_SAFE;
+		given_checkout_opts->checkout_strategy : 0;
 
 	if ((error = git_indexwriter_init_for_operation(&indexwriter, repo,
 		&checkout_strategy)) < 0)

data/vendor/libgit2/src/libgit2/merge_driver.c

@@ -218,7 +218,7 @@ int git_merge_driver_global_init(void)
 
 done:
 	if (error < 0)
-		git_vector_free_deep(&merge_driver_registry.drivers);
+		git_vector_dispose_deep(&merge_driver_registry.drivers);
 
 	return error;
 }
@@ -238,7 +238,7 @@ static void git_merge_driver_global_shutdown(void)
 		git__free(entry);
 	}
 
-	git_vector_free(&merge_driver_registry.drivers);
+	git_vector_dispose(&merge_driver_registry.drivers);
 
 	git_rwlock_wrunlock(&merge_driver_registry.lock);
 	git_rwlock_free(&merge_driver_registry.lock);

data/vendor/libgit2/src/libgit2/midx.c

@@ -484,7 +484,7 @@ int git_midx_close(git_midx_file *idx)
 	if (idx->index_map.data)
 		git_futils_mmap_free(&idx->index_map);
 
-	git_vector_free(&idx->packfile_names);
+	git_vector_dispose(&idx->packfile_names);
 
 	return 0;
 }
@@ -508,20 +508,28 @@ static int packfile__cmp(const void *a_, const void *b_)
 }
 
 int git_midx_writer_new(
-		git_midx_writer **out,
-		const char *pack_dir
+	git_midx_writer **out,
+	const char *pack_dir
 #ifdef GIT_EXPERIMENTAL_SHA256
-		, git_oid_t oid_type
+	, git_midx_writer_options *opts
 #endif
 		)
 {
 	git_midx_writer *w;
+	git_oid_t oid_type;
 
-#ifndef GIT_EXPERIMENTAL_SHA256
-	git_oid_t oid_type = GIT_OID_SHA1;
-#endif
+	GIT_ASSERT_ARG(out && pack_dir);
 
-	GIT_ASSERT_ARG(out && pack_dir && oid_type);
+#ifdef GIT_EXPERIMENTAL_SHA256
+	GIT_ERROR_CHECK_VERSION(opts,
+		GIT_MIDX_WRITER_OPTIONS_VERSION,
+		"git_midx_writer_options");
+
+	oid_type = opts && opts->oid_type ? opts->oid_type : GIT_OID_DEFAULT;
+	GIT_ASSERT_ARG(git_oid_type_is_valid(oid_type));
+#else
+	oid_type = GIT_OID_SHA1;
+#endif
 
 	w = git__calloc(1, sizeof(git_midx_writer));
 	GIT_ERROR_CHECK_ALLOC(w);
@@ -554,7 +562,7 @@ void git_midx_writer_free(git_midx_writer *w)
 
 	git_vector_foreach (&w->packs, i, p)
 		git_mwindow_put_pack(p);
-	git_vector_free(&w->packs);
+	git_vector_dispose(&w->packs);
 	git_str_dispose(&w->pack_dir);
 	git__free(w);
 }
@@ -660,9 +668,11 @@ static int midx_write_hash(const char *buf, size_t size, void *data)
 	struct midx_write_hash_context *ctx = (struct midx_write_hash_context *)data;
 	int error;
 
-	error = git_hash_update(ctx->ctx, buf, size);
-	if (error < 0)
-		return error;
+	if (ctx->ctx) {
+		error = git_hash_update(ctx->ctx, buf, size);
+		if (error < 0)
+			return error;
+	}
 
 	return ctx->write_cb(buf, size, ctx->cb_data);
 }
@@ -703,9 +713,9 @@ static int midx_write(
 	hash_cb_data.ctx = &ctx;
 
 	oid_size = git_oid_size(w->oid_type);
-
-	GIT_ASSERT((checksum_type = git_oid_algorithm(w->oid_type)));
+	checksum_type = git_oid_algorithm(w->oid_type);
 	checksum_size = git_hash_size(checksum_type);
+	GIT_ASSERT(oid_size && checksum_type && checksum_size);
 
 	if ((error = git_hash_ctx_init(&ctx, checksum_type)) < 0)
 		return error;
@@ -863,13 +873,16 @@ static int midx_write(
 	error = git_hash_final(checksum, &ctx);
 	if (error < 0)
 		goto cleanup;
+
+	hash_cb_data.ctx = NULL;
+
 	error = write_cb((char *)checksum, checksum_size, cb_data);
 	if (error < 0)
 		goto cleanup;
 
 cleanup:
 	git_array_clear(object_entries_array);
-	git_vector_free(&object_entries);
+	git_vector_dispose(&object_entries);
 	git_str_dispose(&packfile_names);
 	git_str_dispose(&oid_lookup);
 	git_str_dispose(&object_offsets);

data/vendor/libgit2/src/libgit2/mwindow.c

@@ -11,7 +11,6 @@
 #include "futils.h"
 #include "map.h"
 #include "runtime.h"
-#include "strmap.h"
 #include "pack.h"
 
 #define DEFAULT_WINDOW_SIZE \
@@ -29,33 +28,27 @@ size_t git_mwindow__window_size = DEFAULT_WINDOW_SIZE;
 size_t git_mwindow__mapped_limit = DEFAULT_MAPPED_LIMIT;
 size_t git_mwindow__file_limit = DEFAULT_FILE_LIMIT;
 
-/* Mutex to control access to `git_mwindow__mem_ctl` and `git__pack_cache`. */
-git_mutex git__mwindow_mutex;
+/* Mutex to control access to `git_mwindow__mem_ctl` and `git_mwindow__pack_cache`. */
+git_mutex git_mwindow__mutex;
 
-/* Whenever you want to read or modify this, grab `git__mwindow_mutex` */
+/* Whenever you want to read or modify this, grab `git_mwindow__mutex` */
 git_mwindow_ctl git_mwindow__mem_ctl;
 
 /* Global list of mwindow files, to open packs once across repos */
-git_strmap *git__pack_cache = NULL;
+GIT_HASHMAP_STR_FUNCTIONS(git_mwindow_packmap, , struct git_pack_file *);
+git_mwindow_packmap git_mwindow__pack_cache;
 
 static void git_mwindow_global_shutdown(void)
 {
-	git_strmap *tmp = git__pack_cache;
-
-	git_mutex_free(&git__mwindow_mutex);
-
-	git__pack_cache = NULL;
-	git_strmap_free(tmp);
+	git_mutex_free(&git_mwindow__mutex);
+	git_mwindow_packmap_dispose(&git_mwindow__pack_cache);
 }
 
 int git_mwindow_global_init(void)
 {
 	int error;
 
-	GIT_ASSERT(!git__pack_cache);
-
-	if ((error = git_mutex_init(&git__mwindow_mutex)) < 0 ||
-	    (error = git_strmap_new(&git__pack_cache)) < 0)
+	if ((error = git_mutex_init(&git_mwindow__mutex)) < 0)
 	    return error;
 
 	return git_runtime_shutdown_register(git_mwindow_global_shutdown);
@@ -73,31 +66,34 @@ int git_mwindow_get_pack(
 	if ((error = git_packfile__name(&packname, path)) < 0)
 		return error;
 
-	if (git_mutex_lock(&git__mwindow_mutex) < 0) {
+	if (git_mutex_lock(&git_mwindow__mutex) < 0) {
 		git_error_set(GIT_ERROR_OS, "failed to lock mwindow mutex");
 		return -1;
 	}
 
-	pack = git_strmap_get(git__pack_cache, packname);
+	error = git_mwindow_packmap_get(&pack, &git_mwindow__pack_cache, packname);
 	git__free(packname);
 
-	if (pack != NULL) {
+	if (error == 0) {
 		git_atomic32_inc(&pack->refcount);
-		git_mutex_unlock(&git__mwindow_mutex);
+		git_mutex_unlock(&git_mwindow__mutex);
 		*out = pack;
 		return 0;
+	} else if (error != GIT_ENOTFOUND) {
+		return error;
 	}
 
 	/* If we didn't find it, we need to create it */
 	if ((error = git_packfile_alloc(&pack, path, oid_type)) < 0) {
-		git_mutex_unlock(&git__mwindow_mutex);
+		git_mutex_unlock(&git_mwindow__mutex);
 		return error;
 	}
 
 	git_atomic32_inc(&pack->refcount);
 
-	error = git_strmap_set(git__pack_cache, pack->pack_name, pack);
-	git_mutex_unlock(&git__mwindow_mutex);
+	error = git_mwindow_packmap_put(&git_mwindow__pack_cache, pack->pack_name, pack);
+	git_mutex_unlock(&git_mwindow__mutex);
+
 	if (error < 0) {
 		git_packfile_free(pack, false);
 		return error;
@@ -112,21 +108,18 @@ int git_mwindow_put_pack(struct git_pack_file *pack)
 	int count, error;
 	struct git_pack_file *pack_to_delete = NULL;
 
-	if ((error = git_mutex_lock(&git__mwindow_mutex)) < 0)
+	if ((error = git_mutex_lock(&git_mwindow__mutex)) < 0)
 		return error;
 
-	/* put before get would be a corrupted state */
-	GIT_ASSERT(git__pack_cache);
-
 	/* if we cannot find it, the state is corrupted */
-	GIT_ASSERT(git_strmap_exists(git__pack_cache, pack->pack_name));
+	GIT_ASSERT(git_mwindow_packmap_contains(&git_mwindow__pack_cache, pack->pack_name));
 
 	count = git_atomic32_dec(&pack->refcount);
 	if (count == 0) {
-		git_strmap_delete(git__pack_cache, pack->pack_name);
+		git_mwindow_packmap_remove(&git_mwindow__pack_cache, pack->pack_name);
 		pack_to_delete = pack;
 	}
-	git_mutex_unlock(&git__mwindow_mutex);
+	git_mutex_unlock(&git_mwindow__mutex);
 	git_packfile_free(pack_to_delete, false);
 
 	return 0;
@@ -134,7 +127,7 @@ int git_mwindow_put_pack(struct git_pack_file *pack)
 
 /*
  * Free all the windows in a sequence, typically because we're done
- * with the file. Needs to hold the git__mwindow_mutex.
+ * with the file. Needs to hold the git_mwindow__mutex.
  */
 static int git_mwindow_free_all_locked(git_mwindow_file *mwf)
 {
@@ -152,7 +145,7 @@ static int git_mwindow_free_all_locked(git_mwindow_file *mwf)
 	}
 
 	if (ctl->windowfiles.length == 0) {
-		git_vector_free(&ctl->windowfiles);
+		git_vector_dispose(&ctl->windowfiles);
 		ctl->windowfiles.contents = NULL;
 	}
 
@@ -176,14 +169,14 @@ int git_mwindow_free_all(git_mwindow_file *mwf)
 {
 	int error;
 
-	if (git_mutex_lock(&git__mwindow_mutex)) {
+	if (git_mutex_lock(&git_mwindow__mutex)) {
 		git_error_set(GIT_ERROR_THREAD, "unable to lock mwindow mutex");
 		return -1;
 	}
 
 	error = git_mwindow_free_all_locked(mwf);
 
-	git_mutex_unlock(&git__mwindow_mutex);
+	git_mutex_unlock(&git_mwindow__mutex);
 
 	return error;
 }
@@ -405,7 +398,7 @@ unsigned char *git_mwindow_open(
 	git_mwindow_ctl *ctl = &git_mwindow__mem_ctl;
 	git_mwindow *w = *cursor;
 
-	if (git_mutex_lock(&git__mwindow_mutex)) {
+	if (git_mutex_lock(&git_mwindow__mutex)) {
 		git_error_set(GIT_ERROR_THREAD, "unable to lock mwindow mutex");
 		return NULL;
 	}
@@ -427,7 +420,7 @@ unsigned char *git_mwindow_open(
 		if (!w) {
 			w = new_window_locked(mwf->fd, mwf->size, offset);
 			if (w == NULL) {
-				git_mutex_unlock(&git__mwindow_mutex);
+				git_mutex_unlock(&git_mwindow__mutex);
 				return NULL;
 			}
 			w->next = mwf->windows;
@@ -447,7 +440,7 @@ unsigned char *git_mwindow_open(
 	if (left)
 		*left = (unsigned int)(w->window_map.len - offset);
 
-	git_mutex_unlock(&git__mwindow_mutex);
+	git_mutex_unlock(&git_mwindow__mutex);
 	return (unsigned char *) w->window_map.data + offset;
 }
 
@@ -459,14 +452,14 @@ int git_mwindow_file_register(git_mwindow_file *mwf)
 	size_t i;
 	git_mwindow_file *closed_file = NULL;
 
-	if (git_mutex_lock(&git__mwindow_mutex)) {
+	if (git_mutex_lock(&git_mwindow__mutex)) {
 		git_error_set(GIT_ERROR_THREAD, "unable to lock mwindow mutex");
 		return -1;
 	}
 
 	if (ctl->windowfiles.length == 0 &&
 	    (error = git_vector_init(&ctl->windowfiles, 8, NULL)) < 0) {
-		git_mutex_unlock(&git__mwindow_mutex);
+		git_mutex_unlock(&git_mwindow__mutex);
 		goto cleanup;
 	}
 
@@ -486,7 +479,7 @@ int git_mwindow_file_register(git_mwindow_file *mwf)
 	}
 
 	error = git_vector_insert(&ctl->windowfiles, mwf);
-	git_mutex_unlock(&git__mwindow_mutex);
+	git_mutex_unlock(&git_mwindow__mutex);
 	if (error < 0)
 		goto cleanup;
 
@@ -505,7 +498,7 @@ int git_mwindow_file_register(git_mwindow_file *mwf)
 	}
 
 cleanup:
-	git_vector_free(&closed_files);
+	git_vector_dispose(&closed_files);
 	return error;
 }
 
@@ -515,30 +508,30 @@ void git_mwindow_file_deregister(git_mwindow_file *mwf)
 	git_mwindow_file *cur;
 	size_t i;
 
-	if (git_mutex_lock(&git__mwindow_mutex))
+	if (git_mutex_lock(&git_mwindow__mutex))
 		return;
 
 	git_vector_foreach(&ctl->windowfiles, i, cur) {
 		if (cur == mwf) {
 			git_vector_remove(&ctl->windowfiles, i);
-			git_mutex_unlock(&git__mwindow_mutex);
+			git_mutex_unlock(&git_mwindow__mutex);
 			return;
 		}
 	}
-	git_mutex_unlock(&git__mwindow_mutex);
+	git_mutex_unlock(&git_mwindow__mutex);
 }
 
 void git_mwindow_close(git_mwindow **window)
 {
 	git_mwindow *w = *window;
 	if (w) {
-		if (git_mutex_lock(&git__mwindow_mutex)) {
+		if (git_mutex_lock(&git_mwindow__mutex)) {
 			git_error_set(GIT_ERROR_THREAD, "unable to lock mwindow mutex");
 			return;
 		}
 
 		w->inuse_cnt--;
-		git_mutex_unlock(&git__mwindow_mutex);
+		git_mutex_unlock(&git_mwindow__mutex);
 		*window = NULL;
 	}
 }

data/vendor/libgit2/src/libgit2/mwindow.h

@@ -12,6 +12,10 @@
 
 #include "map.h"
 #include "vector.h"
+#include "hashmap_str.h"
+
+GIT_HASHMAP_STR_STRUCT(git_mwindow_packmap, struct git_pack_file *);
+GIT_HASHMAP_STR_PROTOTYPES(git_mwindow_packmap, struct git_pack_file *);
 
 typedef struct git_mwindow {
 	struct git_mwindow *next;

data/vendor/libgit2/src/libgit2/object.c

@@ -526,7 +526,7 @@ static int git_object__short_id(git_str *out, const git_object *obj)
 	git_oid id;
 	git_odb *odb;
 	size_t oid_hexsize;
-	int len = GIT_ABBREV_DEFAULT, error;
+	int len, error;
 
 	GIT_ASSERT_ARG(out);
 	GIT_ASSERT_ARG(obj);
@@ -536,12 +536,13 @@ static int git_object__short_id(git_str *out, const git_object *obj)
 	git_oid_clear(&id, repo->oid_type);
 	oid_hexsize = git_oid_hexsize(repo->oid_type);
 
-	if ((error = git_repository__configmap_lookup(&len, repo, GIT_CONFIGMAP_ABBREV)) < 0)
+	if ((error = git_repository__abbrev_length(&len, repo)) < 0)
 		return error;
 
-	if (len < 0 || (size_t)len > oid_hexsize) {
-		git_error_set(GIT_ERROR_CONFIG, "invalid oid abbreviation setting: '%d'", len);
-		return -1;
+	if ((size_t)len == oid_hexsize) {
+		if ((error = git_oid_cpy(&id, &obj->cached.oid)) < 0) {
+			return error;
+		}
 	}
 
 	if ((error = git_repository_odb(&odb, repo)) < 0)

data/vendor/libgit2/src/libgit2/odb.c

@@ -915,7 +915,7 @@ static void odb_free(git_odb *db)
 		git_mutex_unlock(&db->lock);
 
 	git_commit_graph_free(db->cgraph);
-	git_vector_free(&db->backends);
+	git_vector_dispose(&db->backends);
 	git_cache_dispose(&db->own_cache);
 	git_mutex_free(&db->lock);
 
@@ -1609,7 +1609,7 @@ int git_odb_foreach(git_odb *db, git_odb_foreach_cb cb, void *payload)
 	}
 
 cleanup:
-	git_vector_free(&backends);
+	git_vector_dispose(&backends);
 
 	return error;
 }
@@ -1796,7 +1796,8 @@ void git_odb_stream_free(git_odb_stream *stream)
 	if (stream == NULL)
 		return;
 
-	git_hash_ctx_cleanup(stream->hash_ctx);
+	if (stream->hash_ctx)
+		git_hash_ctx_cleanup(stream->hash_ctx);
 	git__free(stream->hash_ctx);
 	stream->free(stream);
 }
@@ -1922,7 +1923,7 @@ void git_odb_backend_data_free(git_odb_backend *backend, void *data)
 	git__free(data);
 }
 
-int git_odb_refresh(struct git_odb *db)
+int git_odb_refresh(git_odb *db)
 {
 	size_t i;
 	int error;