rugged 0.28.4 → 0.28.4.1

data/vendor/libgit2/src/integer.h

@@ -8,10 +8,10 @@
 #define INCLUDE_integer_h__
 
 /** @return true if p fits into the range of a size_t */
-GIT_INLINE(int) git__is_sizet(int64_t p)
+GIT_INLINE(int) git__is_sizet(git_off_t p)
 {
 	size_t r = (size_t)p;
-	return p == (int64_t)r;
+	return p == (git_off_t)r;
 }
 
 /** @return true if p fits into the range of an ssize_t */
@@ -21,13 +21,6 @@ GIT_INLINE(int) git__is_ssizet(size_t p)
 	return p == (size_t)r;
 }
 
-/** @return true if p fits into the range of a uint16_t */
-GIT_INLINE(int) git__is_uint16(size_t p)
-{
-	uint16_t r = (uint16_t)p;
-	return p == (size_t)r;
-}
-
 /** @return true if p fits into the range of a uint32_t */
 GIT_INLINE(int) git__is_uint32(size_t p)
 {
@@ -36,10 +29,10 @@ GIT_INLINE(int) git__is_uint32(size_t p)
 }
 
 /** @return true if p fits into the range of an unsigned long */
-GIT_INLINE(int) git__is_ulong(int64_t p)
+GIT_INLINE(int) git__is_ulong(git_off_t p)
 {
 	unsigned long r = (unsigned long)p;
-	return p == (int64_t)r;
+	return p == (git_off_t)r;
 }
 
 /** @return true if p fits into the range of an int */
@@ -72,25 +65,15 @@ GIT_INLINE(int) git__is_int(long long p)
 #  error compiler has add with overflow intrinsics but SIZE_MAX is unknown
 # endif
 
-# define git__add_int_overflow(out, one, two) \
-    __builtin_sadd_overflow(one, two, out)
-# define git__sub_int_overflow(out, one, two) \
-    __builtin_ssub_overflow(one, two, out)
-
 /* Use Microsoft's safe integer handling functions where available */
 #elif defined(_MSC_VER)
 
-# define ENABLE_INTSAFE_SIGNED_FUNCTIONS
 # include <intsafe.h>
 
 # define git__add_sizet_overflow(out, one, two) \
     (SizeTAdd(one, two, out) != S_OK)
 # define git__multiply_sizet_overflow(out, one, two) \
     (SizeTMult(one, two, out) != S_OK)
-#define git__add_int_overflow(out, one, two) \
-    (IntAdd(one, two, out) != S_OK)
-#define git__sub_int_overflow(out, one, two) \
-    (IntSub(one, two, out) != S_OK)
 
 #else
 
@@ -118,24 +101,6 @@ GIT_INLINE(bool) git__multiply_sizet_overflow(size_t *out, size_t one, size_t tw
 	return false;
 }
 
-GIT_INLINE(bool) git__add_int_overflow(int *out, int one, int two)
-{
-	if ((two > 0 && one > (INT_MAX - two)) ||
-	    (two < 0 && one < (INT_MIN - two)))
-		return true;
-	*out = one + two;
-	return false;
-}
-
-GIT_INLINE(bool) git__sub_int_overflow(int *out, int one, int two)
-{
-	if ((two > 0 && one < (INT_MIN + two)) ||
-	    (two < 0 && one > (INT_MAX + two)))
-		return true;
-	*out = one - two;
-	return false;
-}
-
 #endif
 
 #endif

data/vendor/libgit2/src/iterator.c

@@ -145,7 +145,7 @@ static int iterator_init_common(
 		(iter->flags & GIT_ITERATOR_PRECOMPOSE_UNICODE) == 0 &&
 		(iter->flags & GIT_ITERATOR_DONT_PRECOMPOSE_UNICODE) == 0) {
 
-		if (git_repository__configmap_lookup(&precompose, repo, GIT_CONFIGMAP_PRECOMPOSE) < 0)
+		if (git_repository__cvar(&precompose, repo, GIT_CVAR_PRECOMPOSE) < 0)
 			git_error_clear();
 		else if (precompose)
 			iter->flags |= GIT_ITERATOR_PRECOMPOSE_UNICODE;
@@ -543,6 +543,8 @@ static int tree_iterator_frame_init(
 	new_frame = git_array_alloc(iter->frames);
 	GIT_ERROR_CHECK_ALLOC(new_frame);
 
+	memset(new_frame, 0, sizeof(tree_iterator_frame));
+
 	if ((error = git_tree_dup(&dup, tree)) < 0)
 		goto done;
 
@@ -550,22 +552,19 @@ static int tree_iterator_frame_init(
 	new_frame->tree = dup;
 
 	if (frame_entry &&
-	    (error = tree_iterator_compute_path(&new_frame->path, frame_entry)) < 0)
+		(error = tree_iterator_compute_path(&new_frame->path, frame_entry)) < 0)
 		goto done;
 
 	cmp = iterator__ignore_case(&iter->base) ?
 		tree_iterator_entry_sort_icase : NULL;
 
-	if ((error = git_vector_init(&new_frame->entries,
-				     dup->entries.size, cmp)) < 0)
+	if ((error = git_vector_init(
+		&new_frame->entries, dup->entries.size, cmp)) < 0)
 		goto done;
 
 	git_array_foreach(dup->entries, i, tree_entry) {
-		if ((new_entry = git_pool_malloc(&iter->entry_pool, 1)) == NULL) {
-			git_error_set_oom();
-			error = -1;
-			goto done;
-		}
+		new_entry = git_pool_malloc(&iter->entry_pool, 1);
+		GIT_ERROR_CHECK_ALLOC(new_entry);
 
 		new_entry->tree_entry = tree_entry;
 		new_entry->parent_path = new_frame->path.ptr;
@@ -1522,7 +1521,7 @@ static void filesystem_iterator_set_current(
 static int filesystem_iterator_current(
 	const git_index_entry **out, git_iterator *i)
 {
-	filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
+	filesystem_iterator *iter = (filesystem_iterator *)i;
 
 	if (!iterator__has_been_accessed(i))
 		return iter->base.cb->advance(out, i);
@@ -1569,7 +1568,7 @@ done:
 static int filesystem_iterator_advance(
 	const git_index_entry **out, git_iterator *i)
 {
-	filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
+	filesystem_iterator *iter = (filesystem_iterator *)i;
 	bool is_dir;
 	int error = 0;
 
@@ -1628,7 +1627,7 @@ static int filesystem_iterator_advance(
 static int filesystem_iterator_advance_into(
 	const git_index_entry **out, git_iterator *i)
 {
-	filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
+	filesystem_iterator *iter = (filesystem_iterator *)i;
 	filesystem_iterator_frame *frame;
 	filesystem_iterator_entry *prev_entry;
 	int error;
@@ -1665,7 +1664,7 @@ static int filesystem_iterator_advance_into(
 
 int git_iterator_current_workdir_path(git_buf **out, git_iterator *i)
 {
-	filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
+	filesystem_iterator *iter = (filesystem_iterator *)i;
 	const git_index_entry *entry;
 
 	if (i->type != GIT_ITERATOR_TYPE_FS &&
@@ -1725,19 +1724,15 @@ GIT_INLINE(bool) filesystem_iterator_current_is_ignored(
 
 bool git_iterator_current_is_ignored(git_iterator *i)
 {
-	filesystem_iterator *iter = NULL;
-
 	if (i->type != GIT_ITERATOR_TYPE_WORKDIR)
 		return false;
 
-	iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
-
-	return filesystem_iterator_current_is_ignored(iter);
+	return filesystem_iterator_current_is_ignored((filesystem_iterator *)i);
 }
 
 bool git_iterator_current_tree_is_ignored(git_iterator *i)
 {
-	filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
+	filesystem_iterator *iter = (filesystem_iterator *)i;
 	filesystem_iterator_frame *frame;
 
 	if (i->type != GIT_ITERATOR_TYPE_WORKDIR)
@@ -1752,7 +1747,7 @@ static int filesystem_iterator_advance_over(
 	git_iterator_status_t *status,
 	git_iterator *i)
 {
-	filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
+	filesystem_iterator *iter = (filesystem_iterator *)i;
 	filesystem_iterator_frame *current_frame;
 	filesystem_iterator_entry *current_entry;
 	const git_index_entry *entry = NULL;
@@ -1871,7 +1866,7 @@ static int filesystem_iterator_init(filesystem_iterator *iter)
 
 static int filesystem_iterator_reset(git_iterator *i)
 {
-	filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
+	filesystem_iterator *iter = (filesystem_iterator *)i;
 
 	filesystem_iterator_clear(iter);
 	return filesystem_iterator_init(iter);
@@ -1879,7 +1874,7 @@ static int filesystem_iterator_reset(git_iterator *i)
 
 static void filesystem_iterator_free(git_iterator *i)
 {
-	filesystem_iterator *iter = GIT_CONTAINER_OF(i, filesystem_iterator, base);
+	filesystem_iterator *iter = (filesystem_iterator *)i;
 	git__free(iter->root);
 	git_buf_dispose(&iter->current_path);
 	git_tree_free(iter->tree);
@@ -2088,7 +2083,7 @@ static int index_iterator_skip_pseudotree(index_iterator *iter)
 static int index_iterator_advance(
 	const git_index_entry **out, git_iterator *i)
 {
-	index_iterator *iter = GIT_CONTAINER_OF(i, index_iterator, base);
+	index_iterator *iter = (index_iterator *)i;
 	const git_index_entry *entry = NULL;
 	bool is_submodule;
 	int error = 0;
@@ -2161,7 +2156,7 @@ static int index_iterator_advance(
 static int index_iterator_advance_into(
 	const git_index_entry **out, git_iterator *i)
 {
-	index_iterator *iter = GIT_CONTAINER_OF(i, index_iterator, base);
+	index_iterator *iter = (index_iterator *)i;
 
 	if (! S_ISDIR(iter->tree_entry.mode)) {
 		if (out)
@@ -2179,7 +2174,7 @@ static int index_iterator_advance_over(
 	git_iterator_status_t *status,
 	git_iterator *i)
 {
-	index_iterator *iter = GIT_CONTAINER_OF(i, index_iterator, base);
+	index_iterator *iter = (index_iterator *)i;
 	const git_index_entry *entry;
 	int error;
 
@@ -2208,7 +2203,7 @@ static int index_iterator_init(index_iterator *iter)
 
 static int index_iterator_reset(git_iterator *i)
 {
-	index_iterator *iter = GIT_CONTAINER_OF(i, index_iterator, base);
+	index_iterator *iter = (index_iterator *)i;
 
 	index_iterator_clear(iter);
 	return index_iterator_init(iter);
@@ -2216,7 +2211,7 @@ static int index_iterator_reset(git_iterator *i)
 
 static void index_iterator_free(git_iterator *i)
 {
-	index_iterator *iter = GIT_CONTAINER_OF(i, index_iterator, base);
+	index_iterator *iter = (index_iterator *)i;
 
 	git_index_snapshot_release(&iter->entries, iter->base.index);
 	git_buf_dispose(&iter->tree_buf);

data/vendor/libgit2/src/map.h

@@ -40,7 +40,7 @@ typedef struct { /* memory mapped buffer	*/
 	assert((prot & GIT_PROT_WRITE) || (prot & GIT_PROT_READ)); \
 	assert((flags & GIT_MAP_FIXED) == 0); } while (0)
 
-extern int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, off64_t offset);
+extern int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset);
 extern int p_munmap(git_map *map);
 
 #endif

data/vendor/libgit2/src/merge.c

@@ -310,55 +310,46 @@ static int interesting(git_pqueue *list)
 	return 0;
 }
 
-static int clear_commit_marks_1(git_commit_list **plist,
+static void clear_commit_marks_1(git_commit_list **plist,
 		git_commit_list_node *commit, unsigned int mark)
 {
 	while (commit) {
 		unsigned int i;
 
 		if (!(mark & commit->flags))
-			return 0;
+			return;
 
 		commit->flags &= ~mark;
 
 		for (i = 1; i < commit->out_degree; i++) {
 			git_commit_list_node *p = commit->parents[i];
-			if (git_commit_list_insert(p, plist) == NULL)
-				return -1;
+			git_commit_list_insert(p, plist);
 		}
 
 		commit = commit->out_degree ? commit->parents[0] : NULL;
 	}
-
-	return 0;
 }
 
-static int clear_commit_marks_many(git_vector *commits, unsigned int mark)
+static void clear_commit_marks_many(git_vector *commits, unsigned int mark)
 {
 	git_commit_list *list = NULL;
 	git_commit_list_node *c;
 	unsigned int i;
 
 	git_vector_foreach(commits, i, c) {
-		if (git_commit_list_insert(c, &list) == NULL)
-			return -1;
+		git_commit_list_insert(c, &list);
 	}
 
 	while (list)
-		if (clear_commit_marks_1(&list, git_commit_list_pop(&list), mark) < 0)
-			return -1;
-	return 0;
+		clear_commit_marks_1(&list, git_commit_list_pop(&list), mark);
 }
 
-static int clear_commit_marks(git_commit_list_node *commit, unsigned int mark)
+static void clear_commit_marks(git_commit_list_node *commit, unsigned int mark)
 {
 	git_commit_list *list = NULL;
-	if (git_commit_list_insert(commit, &list) == NULL)
-		return -1;
+	git_commit_list_insert(commit, &list);
 	while (list)
-		if (clear_commit_marks_1(&list, git_commit_list_pop(&list), mark) < 0)
-			return -1;
-	return 0;
+		clear_commit_marks_1(&list, git_commit_list_pop(&list), mark);
 }
 
 static int paint_down_to_common(
@@ -475,11 +466,10 @@ static int remove_redundant(git_revwalk *walk, git_vector *commits)
 				redundant[filled_index[j]] = 1;
 		}
 
-		git_commit_list_free(&common);
+		clear_commit_marks(commit, ALL_FLAGS);
+		clear_commit_marks_many(&work, ALL_FLAGS);
 
-		if ((error = clear_commit_marks(commit, ALL_FLAGS)) < 0 ||
-		    (error = clear_commit_marks_many(&work, ALL_FLAGS)) < 0)
-				goto done;
+		git_commit_list_free(&common);
 	}
 
 	for (i = 0; i < commits->length; ++i) {
@@ -541,9 +531,10 @@ int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_l
 		while (result)
 			git_vector_insert(&redundant, git_commit_list_pop(&result));
 
-		if ((error = clear_commit_marks(one, ALL_FLAGS)) < 0 ||
-		    (error = clear_commit_marks_many(twos, ALL_FLAGS)) < 0 ||
-		    (error = remove_redundant(walk, &redundant)) < 0) {
+		clear_commit_marks(one, ALL_FLAGS);
+		clear_commit_marks_many(twos, ALL_FLAGS);
+
+		if ((error = remove_redundant(walk, &redundant)) < 0) {
 			git_vector_free(&redundant);
 			return error;
 		}
@@ -876,7 +867,7 @@ static int merge_conflict_invoke_driver(
 
 	git_oid_cpy(&result->id, &oid);
 	result->mode = mode;
-	result->file_size = (uint32_t)buf.size;
+	result->file_size = buf.size;
 
 	result->path = git_pool_strdup(&diff_list->pool, path);
 	GIT_ERROR_CHECK_ALLOC(result->path);
@@ -1024,7 +1015,7 @@ static int index_entry_similarity_calc(
 {
 	git_blob *blob;
 	git_diff_file diff_file = {{{0}}};
-	git_object_size_t blobsize;
+	git_off_t blobsize;
 	int error;
 
 	*out = NULL;
@@ -1113,12 +1104,14 @@ static void deletes_by_oid_free(git_oidmap *map) {
 	git_oidmap_free(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_oidmap *map, git_pool* pool, const git_oid *id, size_t idx) {
+	size_t pos;
 	deletes_by_oid_queue *queue;
 	size_t *array_entry;
+	int error;
 
-	if ((queue = git_oidmap_get(map, id)) == NULL) {
+	pos = git_oidmap_lookup_index(map, id);
+	if (!git_oidmap_valid_index(map, pos)) {
 		queue = git_pool_malloc(pool, sizeof(deletes_by_oid_queue));
 		GIT_ERROR_CHECK_ALLOC(queue);
 
@@ -1126,9 +1119,11 @@ 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)
+		git_oidmap_insert(map, id, queue, &error);
+		if (error < 0)
 			return -1;
 	} else {
+		queue = git_oidmap_value_at(map, pos);
 		array_entry = git_array_alloc(queue->arr);
 		GIT_ERROR_CHECK_ALLOC(array_entry);
 		*array_entry = idx;
@@ -1137,14 +1132,18 @@ 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_oidmap *map, const git_oid *id) {
+	size_t pos;
 	deletes_by_oid_queue *queue;
 	size_t *array_entry;
 
-	if ((queue = git_oidmap_get(map, id)) == NULL)
+	pos = git_oidmap_lookup_index(map, id);
+
+	if (!git_oidmap_valid_index(map, pos))
 		return GIT_ENOTFOUND;
 
+	queue = git_oidmap_value_at(map, pos);
+
 	if (queue->next_pos == 0) {
 		*idx = queue->first_entry;
 	} else {
@@ -1169,8 +1168,8 @@ static int merge_diff_mark_similarity_exact(
 	git_oidmap *ours_deletes_by_oid = NULL, *theirs_deletes_by_oid = NULL;
 	int error = 0;
 
-	if (git_oidmap_new(&ours_deletes_by_oid) < 0 ||
-	    git_oidmap_new(&theirs_deletes_by_oid) < 0) {
+	if (!(ours_deletes_by_oid = git_oidmap_alloc()) ||
+		!(theirs_deletes_by_oid = git_oidmap_alloc())) {
 		error = -1;
 		goto done;
 	}
@@ -2431,7 +2430,7 @@ static int write_merge_head(
 	assert(repo && heads);
 
 	if ((error = git_buf_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)
+		(error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_FORCE, GIT_MERGE_FILE_MODE)) < 0)
 		goto cleanup;
 
 	for (i = 0; i < heads_len; i++) {
@@ -2459,7 +2458,7 @@ static int write_merge_mode(git_repository *repo)
 	assert(repo);
 
 	if ((error = git_buf_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)
+		(error = git_filebuf_open(&file, file_path.ptr, GIT_FILEBUF_FORCE, GIT_MERGE_FILE_MODE)) < 0)
 		goto cleanup;
 
 	if ((error = git_filebuf_write(&file, "no-ff", 5)) < 0)
@@ -2690,7 +2689,7 @@ static int write_merge_msg(
 		entries[i].merge_head = heads[i];
 
 	if ((error = git_buf_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_open(&file, file_path.ptr, GIT_FILEBUF_FORCE, GIT_MERGE_FILE_MODE)) < 0 ||
 		(error = git_filebuf_write(&file, "Merge ", 6)) < 0)
 		goto cleanup;
 
@@ -3121,6 +3120,9 @@ static int merge_heads(
 	*ancestor_head_out = NULL;
 	*our_head_out = NULL;
 
+	if ((error = git_repository__ensure_not_bare(repo, "merge")) < 0)
+		goto done;
+
 	if ((error = git_annotated_commit_from_ref(&our_head, repo, our_ref)) < 0)
 		goto done;
 
@@ -3331,40 +3333,24 @@ done:
 	return error;
 }
 
-int git_merge_options_init(git_merge_options *opts, unsigned int version)
+int git_merge_init_options(git_merge_options *opts, unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
 		opts, version, git_merge_options, GIT_MERGE_OPTIONS_INIT);
 	return 0;
 }
 
-int git_merge_init_options(git_merge_options *opts, unsigned int version)
-{
-	return git_merge_options_init(opts, version);
-}
-
-int git_merge_file_input_init(git_merge_file_input *input, unsigned int version)
+int git_merge_file_init_input(git_merge_file_input *input, unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
 		input, version, git_merge_file_input, GIT_MERGE_FILE_INPUT_INIT);
 	return 0;
 }
 
-int git_merge_file_init_input(git_merge_file_input *input, unsigned int version)
-{
-	return git_merge_file_input_init(input, version);
-}
-
-int git_merge_file_options_init(
+int git_merge_file_init_options(
 	git_merge_file_options *opts, unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
 		opts, version, git_merge_file_options, GIT_MERGE_FILE_OPTIONS_INIT);
 	return 0;
 }
-
-int git_merge_file_init_options(
-	git_merge_file_options *opts, unsigned int version)
-{
-	return git_merge_file_options_init(opts, version);
-}