rugged 1.3.1 → 1.9.0

data/vendor/libgit2/src/{merge.c → libgit2/merge.c}

@@ -8,11 +8,11 @@
 #include "merge.h"
 
 #include "posix.h"
-#include "buffer.h"
+#include "str.h"
 #include "repository.h"
 #include "revwalk.h"
 #include "commit_list.h"
-#include "path.h"
+#include "fs_path.h"
 #include "refs.h"
 #include "object.h"
 #include "iterator.h"
@@ -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;
@@ -591,7 +590,7 @@ int git_repository_mergehead_foreach(
 	git_repository_mergehead_foreach_cb cb,
 	void *payload)
 {
-	git_buf merge_head_path = GIT_BUF_INIT, merge_head_file = GIT_BUF_INIT;
+	git_str merge_head_path = GIT_STR_INIT, merge_head_file = GIT_STR_INIT;
 	char *buffer, *line;
 	size_t line_num = 1;
 	git_oid oid;
@@ -600,24 +599,24 @@ int git_repository_mergehead_foreach(
 	GIT_ASSERT_ARG(repo);
 	GIT_ASSERT_ARG(cb);
 
-	if ((error = git_buf_joinpath(&merge_head_path, repo->gitdir,
+	if ((error = git_str_joinpath(&merge_head_path, repo->gitdir,
 		GIT_MERGE_HEAD_FILE)) < 0)
 		return error;
 
 	if ((error = git_futils_readbuffer(&merge_head_file,
-		git_buf_cstr(&merge_head_path))) < 0)
+		git_str_cstr(&merge_head_path))) < 0)
 		goto cleanup;
 
 	buffer = merge_head_file.ptr;
 
 	while ((line = git__strsep(&buffer, "\n")) != NULL) {
-		if (strlen(line) != GIT_OID_HEXSZ) {
+		if (strlen(line) != git_oid_hexsize(repo->oid_type)) {
 			git_error_set(GIT_ERROR_INVALID, "unable to parse OID - invalid length");
 			error = -1;
 			goto cleanup;
 		}
 
-		if ((error = git_oid_fromstr(&oid, line)) < 0)
+		if ((error = git_oid__fromstr(&oid, line, repo->oid_type)) < 0)
 			goto cleanup;
 
 		if ((error = cb(&oid, payload)) != 0) {
@@ -635,8 +634,8 @@ int git_repository_mergehead_foreach(
 	}
 
 cleanup:
-	git_buf_dispose(&merge_head_path);
-	git_buf_dispose(&merge_head_file);
+	git_str_dispose(&merge_head_path);
+	git_str_dispose(&merge_head_file);
 
 	return error;
 }
@@ -893,7 +892,7 @@ static int merge_conflict_invoke_driver(
 	git_merge_driver_source *src)
 {
 	git_index_entry *result;
-	git_buf buf = GIT_BUF_INIT;
+	git_buf buf = {0};
 	const char *path;
 	uint32_t mode;
 	git_odb *odb = NULL;
@@ -1061,7 +1060,7 @@ static int index_entry_similarity_calc(
 	const git_merge_options *opts)
 {
 	git_blob *blob;
-	git_diff_file diff_file = {{{0}}};
+	git_diff_file diff_file;
 	git_object_size_t blobsize;
 	int error;
 
@@ -1070,6 +1069,8 @@ static int index_entry_similarity_calc(
 
 	*out = NULL;
 
+	git_oid_clear(&diff_file.id, repo->oid_type);
+
 	if ((error = git_blob_lookup(&blob, repo, &entry->id)) < 0)
 		return error;
 
@@ -1142,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);
 
@@ -1167,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);
@@ -1178,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;
@@ -1207,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
@@ -1223,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;
 		}
@@ -1241,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;
 
@@ -1251,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;
 
@@ -1262,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;
 }
@@ -1857,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);
 }
@@ -1997,8 +2005,11 @@ static int index_update_reuc(git_index *index, git_merge_diff_list *diff_list)
 	return 0;
 }
 
-static int index_from_diff_list(git_index **out,
-	git_merge_diff_list *diff_list, bool skip_reuc)
+static int index_from_diff_list(
+	git_index **out,
+	git_merge_diff_list *diff_list,
+	git_oid_t oid_type,
+	bool skip_reuc)
 {
 	git_index *index;
 	size_t i;
@@ -2007,7 +2018,7 @@ static int index_from_diff_list(git_index **out,
 
 	*out = NULL;
 
-	if ((error = git_index_new(&index)) < 0)
+	if ((error = git_index__new(&index, oid_type)) < 0)
 		return error;
 
 	if ((error = git_index__fill(index, &diff_list->staged)) < 0)
@@ -2116,11 +2127,11 @@ int git_merge__iterators(
 	file_opts.flags = opts.file_flags;
 
 	/* use the git-inspired labels when virtual base building */
-	if (opts.flags & GIT_MERGE__VIRTUAL_BASE) {
+	if (opts.flags & GIT_MERGE_VIRTUAL_BASE) {
 		file_opts.ancestor_label = "merged common ancestors";
 		file_opts.our_label = "Temporary merge branch 1";
 		file_opts.their_label = "Temporary merge branch 2";
-		file_opts.flags |= GIT_MERGE_FILE_FAVOR__CONFLICTED;
+		file_opts.flags |= GIT_MERGE_FILE_ACCEPT_CONFLICTS;
 		file_opts.marker_size = GIT_MERGE_CONFLICT_MARKER_SIZE + 2;
 	}
 
@@ -2157,7 +2168,7 @@ int git_merge__iterators(
 		}
 	}
 
-	error = index_from_diff_list(out, diff_list,
+	error = index_from_diff_list(out, diff_list, repo->oid_type,
 		(opts.flags & GIT_MERGE_SKIP_REUC));
 
 done:
@@ -2200,8 +2211,8 @@ int git_merge_trees(
 			result = our_tree;
 
 		if (result) {
-			if ((error = git_index_new(out)) == 0)
-    			error = git_index_read_tree(*out, result);
+			if ((error = git_index__new(out, repo->oid_type)) == 0)
+				error = git_index_read_tree(*out, result);
 
 			return error;
 		}
@@ -2280,7 +2291,7 @@ static int create_virtual_base(
 		memcpy(&virtual_opts, opts, sizeof(git_merge_options));
 
 	virtual_opts.flags &= ~GIT_MERGE_FAIL_ON_CONFLICT;
-	virtual_opts.flags |= GIT_MERGE__VIRTUAL_BASE;
+	virtual_opts.flags |= GIT_MERGE_VIRTUAL_BASE;
 
 	if ((merge_annotated_commits(&index, NULL, repo, one, two,
 			recursion_level + 1, &virtual_opts)) < 0)
@@ -2473,14 +2484,14 @@ static int write_merge_head(
 	size_t heads_len)
 {
 	git_filebuf file = GIT_FILEBUF_INIT;
-	git_buf file_path = GIT_BUF_INIT;
+	git_str file_path = GIT_STR_INIT;
 	size_t i;
 	int error = 0;
 
 	GIT_ASSERT_ARG(repo);
 	GIT_ASSERT_ARG(heads);
 
-	if ((error = git_buf_joinpath(&file_path, repo->gitdir, GIT_MERGE_HEAD_FILE)) < 0 ||
+	if ((error = git_str_joinpath(&file_path, repo->gitdir, GIT_MERGE_HEAD_FILE)) < 0 ||
 		(error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_CREATE_LEADING_DIRS, GIT_MERGE_FILE_MODE)) < 0)
 		goto cleanup;
 
@@ -2495,7 +2506,7 @@ cleanup:
 	if (error < 0)
 		git_filebuf_cleanup(&file);
 
-	git_buf_dispose(&file_path);
+	git_str_dispose(&file_path);
 
 	return error;
 }
@@ -2503,12 +2514,12 @@ cleanup:
 static int write_merge_mode(git_repository *repo)
 {
 	git_filebuf file = GIT_FILEBUF_INIT;
-	git_buf file_path = GIT_BUF_INIT;
+	git_str file_path = GIT_STR_INIT;
 	int error = 0;
 
 	GIT_ASSERT_ARG(repo);
 
-	if ((error = git_buf_joinpath(&file_path, repo->gitdir, GIT_MERGE_MODE_FILE)) < 0 ||
+	if ((error = git_str_joinpath(&file_path, repo->gitdir, GIT_MERGE_MODE_FILE)) < 0 ||
 		(error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_CREATE_LEADING_DIRS, GIT_MERGE_FILE_MODE)) < 0)
 		goto cleanup;
 
@@ -2521,7 +2532,7 @@ cleanup:
 	if (error < 0)
 		git_filebuf_cleanup(&file);
 
-	git_buf_dispose(&file_path);
+	git_str_dispose(&file_path);
 
 	return error;
 }
@@ -2719,7 +2730,7 @@ static int write_merge_msg(
 	size_t heads_len)
 {
 	git_filebuf file = GIT_FILEBUF_INIT;
-	git_buf file_path = GIT_BUF_INIT;
+	git_str file_path = GIT_STR_INIT;
 	struct merge_msg_entry *entries;
 	git_vector matching = GIT_VECTOR_INIT;
 	size_t i;
@@ -2740,7 +2751,7 @@ static int write_merge_msg(
 	for (i = 0; i < heads_len; i++)
 		entries[i].merge_head = heads[i];
 
-	if ((error = git_buf_joinpath(&file_path, repo->gitdir, GIT_MERGE_MSG_FILE)) < 0 ||
+	if ((error = git_str_joinpath(&file_path, repo->gitdir, GIT_MERGE_MSG_FILE)) < 0 ||
 		(error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_CREATE_LEADING_DIRS, GIT_MERGE_FILE_MODE)) < 0 ||
 		(error = git_filebuf_write(&file, "Merge ", 6)) < 0)
 		goto cleanup;
@@ -2822,9 +2833,9 @@ cleanup:
 	if (error < 0)
 		git_filebuf_cleanup(&file);
 
-	git_buf_dispose(&file_path);
+	git_str_dispose(&file_path);
 
-	git_vector_free(&matching);
+	git_vector_dispose(&matching);
 	git__free(entries);
 
 	return error;
@@ -3003,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;
 }
@@ -3019,10 +3030,10 @@ static int merge_check_workdir(size_t *conflicts, git_repository *repo, git_inde
 	*conflicts = 0;
 
 	/* We need to have merged at least 1 file for the possibility to exist to
-	 * have conflicts with the workdir. Passing 0 as the pathspec count paramter
+	 * have conflicts with the workdir. Passing 0 as the pathspec count parameter
 	 * will consider all files in the working directory, that is, we may detect
 	 * a conflict if there were untracked files in the workdir prior to starting
-	 * the merge. This typically happens when cherry-picking a commmit whose
+	 * the merge. This typically happens when cherry-picking a commit whose
 	 * changes have already been applied.
 	 */
 	if (merged_paths->length == 0)
@@ -3100,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);
@@ -3114,7 +3125,7 @@ int git_merge__append_conflicts_to_merge_msg(
 	git_index *index)
 {
 	git_filebuf file = GIT_FILEBUF_INIT;
-	git_buf file_path = GIT_BUF_INIT;
+	git_str file_path = GIT_STR_INIT;
 	const char *last = NULL;
 	size_t i;
 	int error;
@@ -3122,11 +3133,11 @@ int git_merge__append_conflicts_to_merge_msg(
 	if (!git_index_has_conflicts(index))
 		return 0;
 
-	if ((error = git_buf_joinpath(&file_path, repo->gitdir, GIT_MERGE_MSG_FILE)) < 0 ||
+	if ((error = git_str_joinpath(&file_path, repo->gitdir, GIT_MERGE_MSG_FILE)) < 0 ||
 		(error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_APPEND, GIT_MERGE_FILE_MODE)) < 0)
 		goto cleanup;
 
-	git_filebuf_printf(&file, "\nConflicts:\n");
+	git_filebuf_printf(&file, "\n#Conflicts:\n");
 
 	for (i = 0; i < git_index_entrycount(index); i++) {
 		const git_index_entry *e = git_index_get_byindex(index, i);
@@ -3135,7 +3146,7 @@ int git_merge__append_conflicts_to_merge_msg(
 			continue;
 
 		if (last == NULL || strcmp(e->path, last) != 0)
-			git_filebuf_printf(&file, "\t%s\n", e->path);
+			git_filebuf_printf(&file, "#\t%s\n", e->path);
 
 		last = e->path;
 	}
@@ -3146,7 +3157,7 @@ cleanup:
 	if (error < 0)
 		git_filebuf_cleanup(&file);
 
-	git_buf_dispose(&file_path);
+	git_str_dispose(&file_path);
 
 	return error;
 }
@@ -3341,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/{merge.h → libgit2/merge.h}

@@ -25,19 +25,6 @@
 #define GIT_MERGE_DEFAULT_RENAME_THRESHOLD	50
 #define GIT_MERGE_DEFAULT_TARGET_LIMIT		1000
 
-
-/** Internal merge flags. */
-enum {
-	/** The merge is for a virtual base in a recursive merge. */
-	GIT_MERGE__VIRTUAL_BASE = (1 << 31),
-};
-
-enum {
-	/** Accept the conflict file, staging it as the merge result. */
-	GIT_MERGE_FILE_FAVOR__CONFLICTED = 4,
-};
-
-
 /** Types of changes when files are merged from branch to branch. */
 typedef enum {
 	/* No conflict - a change only occurs in one branch. */
@@ -83,7 +70,7 @@ typedef enum {
 	GIT_MERGE_DIFF_DIRECTORY_FILE = (1 << 10),
 
 	/* The child of a folder that is in a directory/file conflict. */
-	GIT_MERGE_DIFF_DF_CHILD = (1 << 11),
+	GIT_MERGE_DIFF_DF_CHILD = (1 << 11)
 } git_merge_diff_t;
 
 typedef struct {

data/vendor/libgit2/src/{merge_driver.c → libgit2/merge_driver.c}

@@ -93,7 +93,7 @@ int git_merge_driver__builtin_apply(
 		goto done;
 
 	if (!result.automergeable &&
-		!(file_opts.flags & GIT_MERGE_FILE_FAVOR__CONFLICTED)) {
+		!(file_opts.flags & GIT_MERGE_FILE_ACCEPT_CONFLICTS)) {
 		error = GIT_EMERGECONFLICT;
 		goto done;
 	}
@@ -110,7 +110,7 @@ int git_merge_driver__builtin_apply(
 
 	merged_out->ptr = (char *)result.ptr;
 	merged_out->size = result.len;
-	merged_out->asize = result.len;
+	merged_out->reserved = 0;
 	result.ptr = NULL;
 
 done:
@@ -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/{merge_file.c → libgit2/merge_file.c}

@@ -19,8 +19,6 @@
 #include "git2/index.h"
 #include "git2/merge.h"
 
-#include "xdiff/xdiff.h"
-
 /* only examine the first 8000 bytes for binaryness.
  * https://github.com/git/git/blob/77bd3ea9f54f1584147b594abc04c26ca516d987/xdiff-interface.c#L197
  */
@@ -86,22 +84,30 @@ static int merge_file__xdiff(
 
 	memset(&xmparam, 0x0, sizeof(xmparam_t));
 
+	if (ours->size > LONG_MAX ||
+	    theirs->size > LONG_MAX ||
+	    (ancestor && ancestor->size > LONG_MAX)) {
+		git_error_set(GIT_ERROR_MERGE, "failed to merge files");
+		error = -1;
+		goto done;
+	}
+
 	if (ancestor) {
 		xmparam.ancestor = (options.ancestor_label) ?
 			options.ancestor_label : ancestor->path;
 		ancestor_mmfile.ptr = (char *)ancestor->ptr;
-		ancestor_mmfile.size = ancestor->size;
+		ancestor_mmfile.size = (long)ancestor->size;
 	}
 
 	xmparam.file1 = (options.our_label) ?
 		options.our_label : ours->path;
 	our_mmfile.ptr = (char *)ours->ptr;
-	our_mmfile.size = ours->size;
+	our_mmfile.size = (long)ours->size;
 
 	xmparam.file2 = (options.their_label) ?
 		options.their_label : theirs->path;
 	their_mmfile.ptr = (char *)theirs->ptr;
-	their_mmfile.size = theirs->size;
+	their_mmfile.size = (long)theirs->size;
 
 	if (options.favor == GIT_MERGE_FILE_FAVOR_OURS)
 		xmparam.favor = XDL_MERGE_FAVOR_OURS;
@@ -115,6 +121,8 @@ static int merge_file__xdiff(
 
 	if (options.flags & GIT_MERGE_FILE_STYLE_DIFF3)
 		xmparam.style = XDL_MERGE_DIFF3;
+	if (options.flags & GIT_MERGE_FILE_STYLE_ZDIFF3)
+		xmparam.style = XDL_MERGE_ZEALOUS_DIFF3;
 
 	if (options.flags & GIT_MERGE_FILE_IGNORE_WHITESPACE)
 		xmparam.xpp.flags |= XDF_IGNORE_WHITESPACE;

data/vendor/libgit2/src/{message.c → libgit2/message.c}

@@ -5,7 +5,9 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "message.h"
+#include "buf.h"
+
+#include "git2/message.h"
 
 static size_t line_length_without_trailing_spaces(const char *line, size_t len)
 {
@@ -21,17 +23,17 @@ static size_t line_length_without_trailing_spaces(const char *line, size_t len)
 
 /* Greatly inspired from git.git "stripspace" */
 /* see https://github.com/git/git/blob/497215d8811ac7b8955693ceaad0899ecd894ed2/builtin/stripspace.c#L4-67 */
-int git_message_prettify(git_buf *message_out, const char *message, int strip_comments, char comment_char)
+static int git_message__prettify(
+	git_str *message_out,
+	const char *message,
+	int strip_comments,
+	char comment_char)
 {
 	const size_t message_len = strlen(message);
 
 	int consecutive_empty_lines = 0;
 	size_t i, line_length, rtrimmed_line_length;
 	char *next_newline;
-	int error;
-
-	if ((error = git_buf_sanitize(message_out)) < 0)
-		return error;
 
 	for (i = 0; i < strlen(message); i += line_length) {
 		next_newline = memchr(message + i, '\n', message_len - i);
@@ -53,12 +55,21 @@ int git_message_prettify(git_buf *message_out, const char *message, int strip_co
 		}
 
 		if (consecutive_empty_lines > 0 && message_out->size > 0)
-			git_buf_putc(message_out, '\n');
+			git_str_putc(message_out, '\n');
 
 		consecutive_empty_lines = 0;
-		git_buf_put(message_out, message + i, rtrimmed_line_length);
-		git_buf_putc(message_out, '\n');
+		git_str_put(message_out, message + i, rtrimmed_line_length);
+		git_str_putc(message_out, '\n');
 	}
 
-	return git_buf_oom(message_out) ? -1 : 0;
+	return git_str_oom(message_out) ? -1 : 0;
+}
+
+int git_message_prettify(
+	git_buf *message_out,
+	const char *message,
+	int strip_comments,
+	char comment_char)
+{
+	GIT_BUF_WRAP_PRIVATE(message_out, git_message__prettify, message, strip_comments, comment_char);
 }