rugged 0.28.4 → 0.28.4.1

data/vendor/libgit2/src/alloc.c

@@ -7,8 +7,11 @@
 
 #include "alloc.h"
 
-#include "allocators/stdalloc.h"
-#include "allocators/win32_crtdbg.h"
+#if defined(GIT_MSVC_CRTDBG)
+# include "win32/w32_crtdbg_stacktrace.h"
+#else
+# include "stdalloc.h"
+#endif
 
 git_allocator git__allocator;
 
@@ -41,3 +44,12 @@ int git_allocator_setup(git_allocator *allocator)
 	memcpy(&git__allocator, allocator, sizeof(*allocator));
 	return 0;
 }
+
+#if !defined(GIT_MSVC_CRTDBG)
+int git_win32_crtdbg_init_allocator(git_allocator *allocator)
+{
+	GIT_UNUSED(allocator);
+	git_error_set(GIT_EINVALID, "crtdbg memory allocator not available");
+	return -1;
+}
+#endif

data/vendor/libgit2/src/apply.c

@@ -7,6 +7,8 @@
 
 #include "apply.h"
 
+#include <assert.h>
+
 #include "git2/apply.h"
 #include "git2/patch.h"
 #include "git2/filter.h"
@@ -16,12 +18,15 @@
 #include "git2/repository.h"
 #include "array.h"
 #include "patch.h"
-#include "futils.h"
+#include "fileops.h"
 #include "delta.h"
 #include "zstream.h"
 #include "reader.h"
 #include "index.h"
 
+#define apply_err(...) \
+	( git_error_set(GIT_ERROR_PATCH, __VA_ARGS__), GIT_EAPPLYFAIL )
+
 typedef struct {
 	/* The lines that we allocate ourself are allocated out of the pool.
 	 * (Lines may have been allocated out of the diff.)
@@ -30,18 +35,6 @@ typedef struct {
 	git_vector lines;
 } patch_image;
 
-static int apply_err(const char *fmt, ...) GIT_FORMAT_PRINTF(1, 2);
-static int apply_err(const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	git_error_vset(GIT_ERROR_PATCH, fmt, ap);
-	va_end(ap);
-
-	return GIT_EAPPLYFAIL;
-}
-
 static void patch_line_init(
 	git_diff_line *out,
 	const char *in,
@@ -66,7 +59,7 @@ static int patch_image_init_fromstr(
 	git_pool_init(&out->pool, sizeof(git_diff_line));
 
 	for (start = in; start < in + in_len; start = end) {
-		end = memchr(start, '\n', in_len - (start - in));
+		end = memchr(start, '\n', in_len);
 
 		if (end == NULL)
 			end = in + in_len;
@@ -206,34 +199,23 @@ static int apply_hunk(
 
 	for (i = 0; i < hunk->line_count; i++) {
 		size_t linenum = hunk->line_start + i;
-		git_diff_line *line = git_array_get(patch->lines, linenum), *prev;
+		git_diff_line *line = git_array_get(patch->lines, linenum);
 
 		if (!line) {
 			error = apply_err("preimage does not contain line %"PRIuZ, linenum);
 			goto done;
 		}
 
-		switch (line->origin) {
-			case GIT_DIFF_LINE_CONTEXT_EOFNL:
-			case GIT_DIFF_LINE_DEL_EOFNL:
-			case GIT_DIFF_LINE_ADD_EOFNL:
-				prev = i ? git_array_get(patch->lines, linenum - 1) : NULL;
-				if (prev && prev->content[prev->content_len - 1] == '\n')
-					prev->content_len -= 1;
-				break;
-			case GIT_DIFF_LINE_CONTEXT:
-				if ((error = git_vector_insert(&preimage.lines, line)) < 0 ||
-				    (error = git_vector_insert(&postimage.lines, line)) < 0)
-					goto done;
-				break;
-			case GIT_DIFF_LINE_DELETION:
-				if ((error = git_vector_insert(&preimage.lines, line)) < 0)
-					goto done;
-				break;
-			case GIT_DIFF_LINE_ADDITION:
-				if ((error = git_vector_insert(&postimage.lines, line)) < 0)
-					goto done;
-				break;
+		if (line->origin == GIT_DIFF_LINE_CONTEXT ||
+			line->origin == GIT_DIFF_LINE_DELETION) {
+			if ((error = git_vector_insert(&preimage.lines, line)) < 0)
+				goto done;
+		}
+
+		if (line->origin == GIT_DIFF_LINE_CONTEXT ||
+			line->origin == GIT_DIFF_LINE_ADDITION) {
+			if ((error = git_vector_insert(&postimage.lines, line)) < 0)
+				goto done;
 		}
 	}
 
@@ -457,6 +439,7 @@ static int apply_one(
 	git_filemode_t pre_filemode;
 	git_index_entry pre_entry, post_entry;
 	bool skip_preimage = false;
+	size_t pos;
 	int error;
 
 	if ((error = git_patch_from_diff(&patch, diff, i)) < 0)
@@ -481,7 +464,8 @@ static int apply_one(
 	 */
 	if (delta->status != GIT_DELTA_RENAMED &&
 	    delta->status != GIT_DELTA_ADDED) {
-		if (git_strmap_exists(removed_paths, delta->old_file.path)) {
+		pos = git_strmap_lookup_index(removed_paths, delta->old_file.path);
+		if (git_strmap_valid_index(removed_paths, pos)) {
 			error = apply_err("path '%s' has been renamed or deleted", delta->old_file.path);
 			goto done;
 		}
@@ -550,7 +534,7 @@ static int apply_one(
 	if (delta->status != GIT_DELTA_DELETED) {
 		if ((error = git_apply__patch(&post_contents, &filename, &mode,
 				pre_contents.ptr, pre_contents.size, patch, opts)) < 0 ||
-			(error = git_blob_create_from_buffer(&post_id, repo,
+			(error = git_blob_create_frombuffer(&post_id, repo,
 				post_contents.ptr, post_contents.size)) < 0)
 			goto done;
 
@@ -565,7 +549,7 @@ static int apply_one(
 
 	if (delta->status == GIT_DELTA_RENAMED ||
 	    delta->status == GIT_DELTA_DELETED)
-		error = git_strmap_set(removed_paths, delta->old_file.path, (char *) delta->old_file.path);
+		git_strmap_insert(removed_paths, delta->old_file.path, (char *)delta->old_file.path, &error);
 
 	if (delta->status == GIT_DELTA_RENAMED ||
 	    delta->status == GIT_DELTA_ADDED)
@@ -593,7 +577,7 @@ static int apply_deltas(
 	size_t i;
 	int error = 0;
 
-	if (git_strmap_new(&removed_paths) < 0)
+	if (git_strmap_alloc(&removed_paths) < 0)
 		return -1;
 
 	for (i = 0; i < git_diff_num_deltas(diff); i++) {
@@ -647,12 +631,9 @@ int git_apply_to_tree(
 	for (i = 0; i < git_diff_num_deltas(diff); i++) {
 		delta = git_diff_get_delta(diff, i);
 
-		if (delta->status == GIT_DELTA_DELETED ||
-			delta->status == GIT_DELTA_RENAMED) {
-			if ((error = git_index_remove(postimage,
-					delta->old_file.path, 0)) < 0)
-				goto done;
-		}
+		if ((error = git_index_remove(postimage,
+				delta->old_file.path, 0)) < 0)
+			goto done;
 	}
 
 	if ((error = apply_deltas(repo, pre_reader, NULL, post_reader, postimage, diff, &opts)) < 0)
@@ -766,13 +747,6 @@ done:
 	return error;
 }
 
-int git_apply_options_init(git_apply_options *opts, unsigned int version)
-{
-	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
-		opts, version, git_apply_options, GIT_APPLY_OPTIONS_INIT);
-	return 0;
-}
-
 /*
  * Handle the three application options ("locations"):
  *
@@ -843,15 +817,11 @@ int git_apply(
 	    (error = git_reader_for_index(&post_reader, repo, postimage)) < 0)
 		goto done;
 
-	if (!(opts.flags & GIT_APPLY_CHECK))
-		if ((error = git_repository_index(&index, repo)) < 0 ||
-		    (error = git_indexwriter_init(&indexwriter, index)) < 0)
-			goto done;
-
-	if ((error = apply_deltas(repo, pre_reader, preimage, post_reader, postimage, diff, &opts)) < 0)
+	if ((error = git_repository_index(&index, repo)) < 0 ||
+	    (error = git_indexwriter_init(&indexwriter, index)) < 0)
 		goto done;
 
-	if ((opts.flags & GIT_APPLY_CHECK))
+	if ((error = apply_deltas(repo, pre_reader, preimage, post_reader, postimage, diff, &opts)) < 0)
 		goto done;
 
 	switch (location) {

data/vendor/libgit2/src/attr.c

@@ -19,18 +19,18 @@ const char *git_attr__true  = "[internal]__TRUE__";
 const char *git_attr__false = "[internal]__FALSE__";
 const char *git_attr__unset = "[internal]__UNSET__";
 
-git_attr_value_t git_attr_value(const char *attr)
+git_attr_t git_attr_value(const char *attr)
 {
 	if (attr == NULL || attr == git_attr__unset)
-		return GIT_ATTR_VALUE_UNSPECIFIED;
+		return GIT_ATTR_UNSPECIFIED_T;
 
 	if (attr == git_attr__true)
-		return GIT_ATTR_VALUE_TRUE;
+		return GIT_ATTR_TRUE_T;
 
 	if (attr == git_attr__false)
-		return GIT_ATTR_VALUE_FALSE;
+		return GIT_ATTR_FALSE_T;
 
-	return GIT_ATTR_VALUE_STRING;
+	return GIT_ATTR_VALUE_T;
 }
 
 static int collect_attr_files(
@@ -215,7 +215,7 @@ int git_attr_foreach(
 		return -1;
 
 	if ((error = collect_attr_files(repo, NULL, flags, pathname, &files)) < 0 ||
-	    (error = git_strmap_new(&seen)) < 0)
+		(error = git_strmap_alloc(&seen)) < 0)
 		goto cleanup;
 
 	git_vector_foreach(&files, i, file) {
@@ -227,7 +227,8 @@ int git_attr_foreach(
 				if (git_strmap_exists(seen, assign->name))
 					continue;
 
-				if ((error = git_strmap_set(seen, assign->name, assign)) < 0)
+				git_strmap_insert(seen, assign->name, assign, &error);
+				if (error < 0)
 					goto cleanup;
 
 				error = callback(assign->name, assign->value, payload);
@@ -252,16 +253,15 @@ static int preload_attr_file(
 	git_attr_session *attr_session,
 	git_attr_file_source source,
 	const char *base,
-	const char *file,
-	bool allow_macros)
+	const char *file)
 {
 	int error;
 	git_attr_file *preload = NULL;
 
 	if (!file)
 		return 0;
-	if (!(error = git_attr_cache__get(&preload, repo, attr_session, source, base, file,
-					  git_attr_file__parse_buffer, allow_macros)))
+	if (!(error = git_attr_cache__get(
+			&preload, repo, attr_session, source, base, file, git_attr_file__parse_buffer)))
 		git_attr_file__free(preload);
 
 	return error;
@@ -305,15 +305,12 @@ static int system_attr_file(
 	return 0;
 }
 
-static int attr_setup(
-	git_repository *repo,
-	git_attr_session *attr_session,
-	uint32_t flags)
+static int attr_setup(git_repository *repo, git_attr_session *attr_session)
 {
-	git_buf path = GIT_BUF_INIT;
-	git_index *idx = NULL;
-	const char *workdir;
 	int error = 0;
+	const char *workdir = git_repository_workdir(repo);
+	git_index *idx = NULL;
+	git_buf path = GIT_BUF_INIT;
 
 	if (attr_session && attr_session->init_setup)
 		return 0;
@@ -321,43 +318,41 @@ static int attr_setup(
 	if ((error = git_attr_cache__init(repo)) < 0)
 		return error;
 
-	/*
-	 * Preload attribute files that could contain macros so the
-	 * definitions will be available for later file parsing.
+	/* preload attribute files that could contain macros so the
+	 * definitions will be available for later file parsing
 	 */
 
-	if ((error = system_attr_file(&path, attr_session)) < 0 ||
-	    (error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
-				       NULL, path.ptr, true)) < 0) {
-		if (error != GIT_ENOTFOUND)
-			goto out;
-	}
+	error = system_attr_file(&path, attr_session);
 
-	if ((error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
-				       NULL, git_repository_attr_cache(repo)->cfg_attr_file, true)) < 0)
+	if (error == 0)
+		error = preload_attr_file(
+			repo, attr_session, GIT_ATTR_FILE__FROM_FILE, NULL, path.ptr);
+
+	if (error != GIT_ENOTFOUND)
 		goto out;
 
-	git_buf_clear(&path); /* git_repository_item_path expects an empty buffer, because it uses git_buf_set */
-	if ((error = git_repository_item_path(&path, repo, GIT_REPOSITORY_ITEM_INFO)) < 0 ||
-	    (error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
-				       path.ptr, GIT_ATTR_FILE_INREPO, true)) < 0) {
-		if (error != GIT_ENOTFOUND)
-			goto out;
-	}
+	if ((error = preload_attr_file(
+			repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
+			NULL, git_repository_attr_cache(repo)->cfg_attr_file)) < 0)
+		goto out;
 
-	if ((workdir = git_repository_workdir(repo)) != NULL &&
-	    (error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
-				       workdir, GIT_ATTR_FILE, true)) < 0)
-			goto out;
+	if ((error = git_repository_item_path(&path,
+			repo, GIT_REPOSITORY_ITEM_INFO)) < 0)
+		goto out;
 
-	if ((error = git_repository_index__weakptr(&idx, repo)) < 0 ||
-	    (error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_INDEX,
-				       NULL, GIT_ATTR_FILE, true)) < 0)
-			goto out;
+	if ((error = preload_attr_file(
+			repo, attr_session, GIT_ATTR_FILE__FROM_FILE,
+			path.ptr, GIT_ATTR_FILE_INREPO)) < 0)
+		goto out;
+
+	if (workdir != NULL &&
+		(error = preload_attr_file(
+			repo, attr_session, GIT_ATTR_FILE__FROM_FILE, workdir, GIT_ATTR_FILE)) < 0)
+		goto out;
 
-	if ((flags & GIT_ATTR_CHECK_INCLUDE_HEAD) != 0 &&
-	    (error = preload_attr_file(repo, attr_session, GIT_ATTR_FILE__FROM_HEAD,
-				       NULL, GIT_ATTR_FILE, true)) < 0)
+	if ((error = git_repository_index__weakptr(&idx, repo)) < 0 ||
+		(error = preload_attr_file(
+			repo, attr_session, GIT_ATTR_FILE__FROM_INDEX, NULL, GIT_ATTR_FILE)) < 0)
 		goto out;
 
 	if (attr_session)
@@ -436,9 +431,6 @@ static int attr_decide_sources(
 		break;
 	}
 
-	if ((flags & GIT_ATTR_CHECK_INCLUDE_HEAD) != 0)
-		srcs[count++] = GIT_ATTR_FILE__FROM_HEAD;
-
 	return count;
 }
 
@@ -448,14 +440,13 @@ static int push_attr_file(
 	git_vector *list,
 	git_attr_file_source source,
 	const char *base,
-	const char *filename,
-	bool allow_macros)
+	const char *filename)
 {
 	int error = 0;
 	git_attr_file *file = NULL;
 
 	error = git_attr_cache__get(&file, repo, attr_session,
-		source, base, filename, git_attr_file__parse_buffer, allow_macros);
+		source, base, filename, git_attr_file__parse_buffer);
 
 	if (error < 0)
 		return error;
@@ -470,18 +461,16 @@ static int push_attr_file(
 
 static int push_one_attr(void *ref, const char *path)
 {
-	attr_walk_up_info *info = (attr_walk_up_info *)ref;
-	git_attr_file_source src[GIT_ATTR_FILE_NUM_SOURCES];
 	int error = 0, n_src, i;
-	bool allow_macros;
+	attr_walk_up_info *info = (attr_walk_up_info *)ref;
+	git_attr_file_source src[2];
 
 	n_src = attr_decide_sources(
 		info->flags, info->workdir != NULL, info->index != NULL, src);
-	allow_macros = info->workdir ? !strcmp(info->workdir, path) : false;
 
 	for (i = 0; !error && i < n_src; ++i)
-		error = push_attr_file(info->repo, info->attr_session, info->files,
-				       src[i], path, GIT_ATTR_FILE, allow_macros);
+		error = push_attr_file(info->repo, info->attr_session,
+			info->files, src[i], path, GIT_ATTR_FILE);
 
 	return error;
 }
@@ -510,7 +499,7 @@ static int collect_attr_files(
 	const char *workdir = git_repository_workdir(repo);
 	attr_walk_up_info info = { NULL };
 
-	if ((error = attr_setup(repo, attr_session, flags)) < 0)
+	if ((error = attr_setup(repo, attr_session)) < 0)
 		return error;
 
 	/* Resolve path in a non-bare repo */
@@ -528,12 +517,15 @@ static int collect_attr_files(
 	 * - $GIT_PREFIX/etc/gitattributes
 	 */
 
-	if ((error = git_repository_item_path(&attrfile, repo, GIT_REPOSITORY_ITEM_INFO)) < 0 ||
-	    (error = push_attr_file(repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE,
-				    attrfile.ptr, GIT_ATTR_FILE_INREPO, true)) < 0) {
-		if (error != GIT_ENOTFOUND)
-			goto cleanup;
-	}
+	error = git_repository_item_path(&attrfile, repo, GIT_REPOSITORY_ITEM_INFO);
+	if (error < 0)
+		goto cleanup;
+
+	error = push_attr_file(
+		repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE,
+		attrfile.ptr, GIT_ATTR_FILE_INREPO);
+	if (error < 0)
+		goto cleanup;
 
 	info.repo = repo;
 	info.attr_session = attr_session;
@@ -552,8 +544,9 @@ static int collect_attr_files(
 		goto cleanup;
 
 	if (git_repository_attr_cache(repo)->cfg_attr_file != NULL) {
-		error = push_attr_file(repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE,
-				       NULL, git_repository_attr_cache(repo)->cfg_attr_file, true);
+		error = push_attr_file(
+			repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE,
+			NULL, git_repository_attr_cache(repo)->cfg_attr_file);
 		if (error < 0)
 			goto cleanup;
 	}
@@ -562,8 +555,9 @@ static int collect_attr_files(
 		error = system_attr_file(&dir, attr_session);
 
 		if (!error)
-			error = push_attr_file(repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE,
-					       NULL, dir.ptr, true);
+			error = push_attr_file(
+				repo, attr_session, files, GIT_ATTR_FILE__FROM_FILE,
+				NULL, dir.ptr);
 		else if (error == GIT_ENOTFOUND)
 			error = 0;
 	}