rugged 1.9.0 → 1.9.5.1

data/vendor/libgit2/include/git2/remote.h

@@ -249,9 +249,9 @@ GIT_EXTERN(const char *) git_remote_name(const git_remote *remote);
 /**
  * Get the remote's url
  *
- * If url.*.insteadOf has been configured for this URL, it will
- * return the modified URL.  If `git_remote_set_instance_pushurl`
- * has been called for this remote, then that URL will be returned.
+ * If url.*.insteadOf has been configured for this URL, it will return
+ * the modified URL. This function does not consider if a push url has
+ * been configured for this remote (use `git_remote_pushurl` if needed).
  *
  * @param remote the remote
  * @return a pointer to the url
@@ -417,6 +417,19 @@ GIT_EXTERN(int) git_remote_ls(const git_remote_head ***out,  size_t *size, git_r
  */
 GIT_EXTERN(int) git_remote_connected(const git_remote *remote);
 
+/**
+ * Get the remote repository's object format.
+ *
+ * The remote (or more exactly its transport) must have connected to
+ * the remote repository. This format is available as soon as the
+ * connection to the remote is initiated and stays connected.
+ *
+ * @param out the resulting object format type
+ * @param remote the remote
+ * @return 0 on success, or an error code
+ */
+GIT_EXTERN(int) git_remote_oid_type(git_oid_t *out, git_remote *remote);
+
 /**
  * Cancel the operation
  *
@@ -596,9 +609,8 @@ struct git_remote_callbacks {
 	git_credential_acquire_cb credentials;
 
 	/**
-	 * If cert verification fails, this will be called to let the
-	 * user make the final decision of whether to allow the
-	 * connection to proceed. Returns 0 to allow the connection
+	 * This will be called to let the user make the final decision of whether
+	 * to allow the connection to proceed. Returns 0 to allow the connection
 	 * or a negative value to indicate an error.
 	 */
 	git_transport_certificate_check_cb certificate_check;
@@ -751,7 +763,7 @@ typedef enum {
 	 */
 	GIT_REMOTE_DOWNLOAD_TAGS_NONE,
 	/**
-	 * Ask for the all the tags.
+	 * Ask for all the tags.
 	 */
 	GIT_REMOTE_DOWNLOAD_TAGS_ALL
 } git_remote_autotag_option_t;

data/vendor/libgit2/include/git2/stdint.h

@@ -221,7 +221,7 @@ typedef uint64_t  uintmax_t;
 #endif /* __STDC_LIMIT_MACROS ] */
 
 
-/* 7.18.4 Limits of other integer types
+/* 7.18.4 Limits of other integer types */
 
 #if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) /* [    See footnote 224 at page 260 */
 

data/vendor/libgit2/include/git2/sys/transport.h

@@ -206,7 +206,7 @@ GIT_EXTERN(int) git_transport_ssh_with_paths(git_transport **out, git_remote *ow
  * and git_transport_unregister with other calls to the library that
  * instantiate transports.
  *
- * @param prefix The scheme (ending in "://") to match, i.e. "git://"
+ * @param prefix The scheme to match, eg "git" or "https"
  * @param cb The callback used to create an instance of the transport
  * @param param A fixed parameter to pass to cb at creation time
  * @return 0 or an error code

data/vendor/libgit2/include/git2/version.h

@@ -7,6 +7,8 @@
 #ifndef INCLUDE_git_version_h__
 #define INCLUDE_git_version_h__
 
+#include "common.h"
+
 /**
  * @file git2/version.h
  * @brief The version of libgit2
@@ -19,7 +21,7 @@ GIT_BEGIN_DECL
  * The version string for libgit2.  This string follows semantic
  * versioning (v2) guidelines.
  */
-#define LIBGIT2_VERSION           "1.9.0"
+#define LIBGIT2_VERSION           "1.9.5"
 
 /** The major version number for this version of libgit2. */
 #define LIBGIT2_VERSION_MAJOR      1
@@ -28,7 +30,7 @@ GIT_BEGIN_DECL
 #define LIBGIT2_VERSION_MINOR      9
 
 /** The revision ("teeny") version number for this version of libgit2. */
-#define LIBGIT2_VERSION_REVISION   0
+#define LIBGIT2_VERSION_REVISION   5
 
 /** The Windows DLL patch number for this version of libgit2. */
 #define LIBGIT2_VERSION_PATCH      0

data/vendor/libgit2/src/cli/CMakeLists.txt

@@ -1,9 +1,8 @@
 set(CLI_INCLUDES
-	"${libgit2_BINARY_DIR}/src/util"
-	"${libgit2_BINARY_DIR}/include"
 	"${libgit2_SOURCE_DIR}/src/util"
 	"${libgit2_SOURCE_DIR}/src/cli"
 	"${libgit2_SOURCE_DIR}/include"
+	"${libgit2_BINARY_DIR}/gen_headers"
 	"${LIBGIT2_DEPENDENCY_INCLUDES}"
 	"${LIBGIT2_SYSTEM_INCLUDES}")
 

data/vendor/libgit2/src/cli/opt.c

@@ -19,7 +19,7 @@
 #include <limits.h>
 #include <assert.h>
 
-#if defined(__sun) || defined(__illumos__)
+#if defined(__sun) || defined(__illumos__) || defined(__CYGWIN__)
 # include <alloca.h>
 #endif
 
@@ -50,7 +50,7 @@ GIT_INLINE(const cli_opt_spec *) spec_for_long(
 	const char *arg)
 {
 	const cli_opt_spec *spec;
-	char *eql;
+	const char *eql;
 	size_t eql_pos;
 
 	eql = strchr(arg, '=');
@@ -359,7 +359,7 @@ GIT_INLINE(const cli_opt_spec *) spec_for_sort(
 	const char *arg)
 {
 	int is_negated, has_value = 0;
-	const char *value;
+	const char *value = NULL;
 	const cli_opt_spec *spec = NULL;
 	size_t idx = 0;
 

data/vendor/libgit2/src/cli/opt_usage.c

@@ -201,7 +201,7 @@ int cli_opt_help_fprint(
 {
 	git_str help = GIT_BUF_INIT;
 	const cli_opt_spec *spec;
-	bool required;
+	bool required = true;
 	int error = 0;
 
 	/* Display required arguments first */

data/vendor/libgit2/src/libgit2/CMakeLists.txt

@@ -7,11 +7,10 @@ include(PkgBuildConfig)
 include(CMakePackageConfigHelpers)
 
 set(LIBGIT2_INCLUDES
-	"${PROJECT_BINARY_DIR}/src/util"
-	"${PROJECT_BINARY_DIR}/include"
 	"${PROJECT_SOURCE_DIR}/src/libgit2"
 	"${PROJECT_SOURCE_DIR}/src/util"
-	"${PROJECT_SOURCE_DIR}/include")
+	"${PROJECT_SOURCE_DIR}/include"
+	"${PROJECT_BINARY_DIR}/gen_headers")
 
 # Collect sourcefiles
 file(GLOB SRC_H
@@ -41,7 +40,11 @@ ide_split_sources(libgit2)
 list(APPEND LIBGIT2_OBJECTS $<TARGET_OBJECTS:util> $<TARGET_OBJECTS:libgit2> ${LIBGIT2_DEPENDENCY_OBJECTS})
 list(APPEND LIBGIT2_INCLUDES ${LIBGIT2_DEPENDENCY_INCLUDES})
 
-target_include_directories(libgit2 PRIVATE ${LIBGIT2_INCLUDES} ${LIBGIT2_DEPENDENCY_INCLUDES} PUBLIC ${PROJECT_SOURCE_DIR}/include)
+target_include_directories(libgit2
+	PRIVATE ${LIBGIT2_INCLUDES} ${LIBGIT2_DEPENDENCY_INCLUDES}
+	PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+	       $<INSTALL_INTERFACE:include>)
+
 target_include_directories(libgit2 SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES})
 
 set(LIBGIT2_INCLUDES ${LIBGIT2_INCLUDES} PARENT_SCOPE)
@@ -55,10 +58,16 @@ set(LIBGIT2_SYSTEM_LIBS ${LIBGIT2_SYSTEM_LIBS} PARENT_SCOPE)
 # Compile and link libgit2
 #
 
+if (NOT BUILD_SHARED_LIBS AND XCODE_VERSION)
+	# This is required for Xcode to actually create the static libgit2 library
+	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.c "")
+	list(APPEND LIBGIT2_OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/dummy.c)
+endif()
+
 add_library(libgit2package ${SRC_RC} ${LIBGIT2_OBJECTS})
 target_link_libraries(libgit2package ${LIBGIT2_SYSTEM_LIBS})
 target_include_directories(libgit2package SYSTEM PRIVATE ${LIBGIT2_INCLUDES})
-target_include_directories(libgit2package INTERFACE $<INSTALL_INTERFACE:./include/git2>)
+target_include_directories(libgit2package INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 
 set_target_properties(libgit2package PROPERTIES C_STANDARD 90)
 set_target_properties(libgit2package PROPERTIES C_EXTENSIONS OFF)
@@ -94,14 +103,23 @@ endif()
 
 # support experimental features and functionality
 
-configure_file(experimental.h.in "${PROJECT_BINARY_DIR}/include/git2/experimental.h")
+configure_file(experimental.h.in "${PROJECT_BINARY_DIR}/gen_headers/experimental.h")
 
-# translate filenames in the git2.h so that they match the install directory
+# translate filenames in the headers so that they match the install directory
 # (allows for side-by-side installs of libgit2 and libgit2-experimental.)
 
-FILE(READ "${PROJECT_SOURCE_DIR}/include/git2.h" LIBGIT2_INCLUDE)
-STRING(REGEX REPLACE "#include \"git2\/" "#include \"${LIBGIT2_FILENAME}/" LIBGIT2_INCLUDE "${LIBGIT2_INCLUDE}")
-FILE(WRITE "${PROJECT_BINARY_DIR}/include/${LIBGIT2_FILENAME}.h" ${LIBGIT2_INCLUDE})
+foreach(HEADER_SOURCE ${SRC_H})
+	file(RELATIVE_PATH HEADER_RELATIVE ${PROJECT_SOURCE_DIR} ${HEADER_SOURCE})
+	string(REGEX REPLACE "^include\/git2" "include/${LIBGIT2_FILENAME}" HEADER_RELATIVE ${HEADER_RELATIVE})
+
+	file(READ "${HEADER_SOURCE}" HEADER_CONTENTS)
+	string(REGEX REPLACE "#include \"git2\/" "#include \"${LIBGIT2_FILENAME}/" HEADER_CONTENTS "${HEADER_CONTENTS}")
+
+	file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${HEADER_RELATIVE}.tmp" "${HEADER_CONTENTS}")
+	configure_file("${CMAKE_CURRENT_BINARY_DIR}/${HEADER_RELATIVE}.tmp" "${PROJECT_BINARY_DIR}/${HEADER_RELATIVE}" COPYONLY)
+endforeach()
+
+configure_file("${PROJECT_BINARY_DIR}/gen_headers/experimental.h" "${PROJECT_BINARY_DIR}/include/${LIBGIT2_FILENAME}/experimental.h" COPYONLY)
 
 # cmake package targets
 
@@ -119,11 +137,11 @@ configure_file(config.cmake.in
 install(FILES
 	"${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake"
 	"${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake"
-	DESTINATION "lib/cmake/${PROJECT_NAME}")
+	DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
 install(
 	EXPORT ${LIBGIT2_TARGETS_EXPORT_NAME}
 	NAMESPACE "${PROJECT_NAME}::"
-	DESTINATION "lib/cmake/${PROJECT_NAME}")
+	DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
 
 # Install
 
@@ -132,9 +150,7 @@ install(TARGETS libgit2package
 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/git2/
-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBGIT2_FILENAME}")
-install(FILES ${PROJECT_BINARY_DIR}/include/git2/experimental.h
-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBGIT2_FILENAME}")
 install(FILES "${PROJECT_BINARY_DIR}/include/${LIBGIT2_FILENAME}.h"
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(DIRECTORY "${PROJECT_BINARY_DIR}/include/${LIBGIT2_FILENAME}"
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

data/vendor/libgit2/src/libgit2/attr_file.c

@@ -347,7 +347,7 @@ int git_attr_file__parse_buffer(
 {
 	const char *scan = data, *context = NULL;
 	git_attr_rule *rule = NULL;
-	int error = 0;
+	int ignorecase = 0, error = 0;
 
 	/* If subdir file path, convert context for file paths */
 	if (attrs->entry && git_fs_path_root(attrs->entry->path) < 0 &&
@@ -379,6 +379,13 @@ int git_attr_file__parse_buffer(
 			continue;
 		}
 
+		if (repo &&
+		    (error = git_repository__configmap_lookup(&ignorecase, repo, GIT_CONFIGMAP_IGNORECASE)) < 0)
+			goto out;
+
+		if (ignorecase)
+			rule->match.flags |= GIT_ATTR_FNMATCH_ICASE;
+
 		if (rule->match.flags & GIT_ATTR_FNMATCH_MACRO) {
 			/* TODO: warning if macro found in file below repo root */
 			if (!allow_macros)
@@ -482,7 +489,7 @@ bool git_attr_fnmatch__match(
 	 */
 	if (match->containing_dir) {
 		if (match->flags & GIT_ATTR_FNMATCH_ICASE) {
-			if (git__strncasecmp(path->path, match->containing_dir, match->containing_dir_length))
+			if (git__prefixcmp_icase(path->path, match->containing_dir))
 				return 0;
 		} else {
 			if (git__prefixcmp(path->path, match->containing_dir))
@@ -804,7 +811,7 @@ int git_attr_fnmatch__parse(
 	}
 
 	if (context) {
-		char *slash = strrchr(context, '/');
+		const char *slash = strrchr(context, '/');
 		size_t len;
 		if (slash) {
 			/* include the slash for easier matching */

data/vendor/libgit2/src/libgit2/blame.c

@@ -461,6 +461,12 @@ static int blame_internal(git_blame *blame)
 
 	for (ent = blame->ent; ent; ent = ent->next) {
 		git_blame_hunk *h = hunk_from_entry(ent, blame);
+
+		if (!h) {
+			error = -1;
+			goto on_error;
+		}
+
 		git_vector_insert(&blame->hunks, h);
 	}
 

data/vendor/libgit2/src/libgit2/clone.c

@@ -519,6 +519,12 @@ static int clone_local_into(
 		return error;
 	}
 
+	/* Propagate the source repository's object format to the target
+	 * so that it can read the copied object database. */
+	if ((error = git_repository__set_objectformat(
+			repo, git_repository_oid_type(src))) < 0)
+		goto cleanup;
+
 	if (git_repository__item_path(&src_odb, src, GIT_REPOSITORY_ITEM_OBJECTS) < 0 ||
 	    git_repository__item_path(&dst_odb, repo, GIT_REPOSITORY_ITEM_OBJECTS) < 0) {
 		error = -1;

data/vendor/libgit2/src/libgit2/commit.c

@@ -340,7 +340,7 @@ int git_commit_amend(
 {
 	git_repository *repo;
 	git_oid tree_id;
-	git_reference *ref;
+	git_reference *ref = NULL;
 	int error;
 
 	GIT_ASSERT_ARG(id);

data/vendor/libgit2/src/libgit2/commit_graph.c

@@ -817,8 +817,7 @@ int git_commit_graph_writer_add_index_file(
 	if (error < 0)
 		goto cleanup;
 
-	/* TODO: SHA256 */
-	error = git_mwindow_get_pack(&p, idx_path, 0);
+	error = git_mwindow_get_pack(&p, idx_path, repo->oid_type);
 	if (error < 0)
 		goto cleanup;
 

data/vendor/libgit2/src/libgit2/config.c

@@ -1447,7 +1447,7 @@ int git_config_parse_bool(int *out, const char *value)
 		return 0;
 	}
 
-	git_error_set(GIT_ERROR_CONFIG, "failed to parse '%s' as a boolean value", value);
+	git_error_set(GIT_ERROR_CONFIG, "failed to parse '%s' as a boolean", value ? value : "(null)");
 	return -1;
 }
 

data/vendor/libgit2/src/libgit2/config_file.c

@@ -1135,7 +1135,8 @@ static int config_file_write(
 	const char *value)
 
 {
-	char *orig_section = NULL, *section = NULL, *orig_name, *name, *ldot;
+	char *orig_section = NULL, *section = NULL;
+	const char *orig_name, *name, *ldot;
 	git_str buf = GIT_STR_INIT, contents = GIT_STR_INIT;
 	git_config_parser parser = GIT_CONFIG_PARSER_INIT;
 	git_filebuf file = GIT_FILEBUF_INIT;

data/vendor/libgit2/src/libgit2/config_mem.c

@@ -199,6 +199,7 @@ static int config_memory_get(git_config_backend *backend, const char *key, git_c
 	if ((error = git_config_list_get(&entry, memory_backend->config_list, key)) != 0)
 		return error;
 
+	git_config_list_incref(memory_backend->config_list);
 	*out = &entry->base;
 	return 0;
 }

data/vendor/libgit2/src/libgit2/config_parse.c

@@ -282,7 +282,8 @@ static int skip_bom(git_parse_ctx *parser)
 /* '\"' -> '"' etc */
 static int unescape_line(char **out, bool *is_multi, const char *ptr, int *quote_count)
 {
-	char *str, *fixed, *esc;
+	char *str, *fixed;
+	const char *esc;
 	size_t ptr_len = strlen(ptr), alloc_len;
 
 	*is_multi = false;

data/vendor/libgit2/src/libgit2/delta.c

@@ -13,6 +13,8 @@
 #define RABIN_SHIFT 23
 #define RABIN_WINDOW 16
 
+extern size_t git_indexer__max_object_size;
+
 static const unsigned int T[256] = {
 	0x00000000, 0xab59b4d1, 0x56b369a2, 0xfdeadd73, 0x063f6795, 0xad66d344,
 	0x508c0e37, 0xfbd5bae6, 0x0c7ecf2a, 0xa7277bfb, 0x5acda688, 0xf1941259,
@@ -477,8 +479,12 @@ static int hdr_sz(
 			return -1;
 		}
 
+		if (shift >= (sizeof(size_t) * 8)) {
+			git_error_set(GIT_ERROR_INVALID, "delta header overflow");
+			return -1;
+		}
 		c = *d++;
-		r |= (c & 0x7f) << shift;
+		r |= ((size_t)(c & 0x7f)) << shift;
 		shift += 7;
 	} while (c & 0x80);
 	*delta = d;
@@ -561,6 +567,12 @@ int git_delta_apply(
 		return -1;
 	}
 
+	if (res_sz > git_indexer__max_object_size) {
+		git_error_set(GIT_ERROR_INVALID,
+			"failed to apply delta: overly large object");
+		return -1;
+	}
+
 	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_sz, res_sz, 1);
 	res_dp = git__malloc(alloc_sz);
 	GIT_ERROR_CHECK_ALLOC(res_dp);

data/vendor/libgit2/src/libgit2/diff_driver.c

@@ -225,7 +225,7 @@ static int git_diff_driver_load(
 {
 	int error = 0;
 	git_diff_driver_registry *reg;
-	git_diff_driver *drv;
+	git_diff_driver *drv = NULL;
 	size_t namelen;
 	git_config *cfg = NULL;
 	git_str name = GIT_STR_INIT;

data/vendor/libgit2/src/libgit2/diff_stats.c

@@ -28,7 +28,6 @@ struct git_diff_stats {
 	size_t files_changed;
 	size_t insertions;
 	size_t deletions;
-	size_t renames;
 
 	size_t max_name;
 	size_t max_filestat;
@@ -68,17 +67,19 @@ static int diff_file_stats_full_to_buf(
 		size_t common_dirlen;
 		int error;
 
-		padding = stats->max_name - strlen(old_path) - strlen(new_path);
-
 		if ((common_dirlen = git_fs_path_common_dirlen(old_path, new_path)) &&
 		    common_dirlen <= INT_MAX) {
 			error = git_str_printf(out, " %.*s{%s"DIFF_RENAME_FILE_SEPARATOR"%s}",
 					       (int) common_dirlen, old_path,
 					       old_path + common_dirlen,
 					       new_path + common_dirlen);
+			padding = stats->max_name + common_dirlen - strlen(old_path)
+			          - strlen(new_path) - 2 - strlen(DIFF_RENAME_FILE_SEPARATOR);
 		} else {
 			error = git_str_printf(out, " %s" DIFF_RENAME_FILE_SEPARATOR "%s",
 					       old_path, new_path);
+			padding = stats->max_name - strlen(old_path)
+			          - strlen(new_path) - strlen(DIFF_RENAME_FILE_SEPARATOR);
 		}
 
 		if (error < 0)
@@ -89,9 +90,6 @@ static int diff_file_stats_full_to_buf(
 			goto on_error;
 
 		padding = stats->max_name - strlen(adddel_path);
-
-		if (stats->renames > 0)
-			padding += strlen(DIFF_RENAME_FILE_SEPARATOR);
 	}
 
 	if (git_str_putcn(out, ' ', padding) < 0 ||
@@ -210,14 +208,23 @@ int git_diff_get_stats(
 		if ((error = git_patch_from_diff(&patch, diff, i)) < 0)
 			break;
 
-		/* keep a count of renames because it will affect formatting */
+		/* Length calculation for renames mirrors the actual presentation format
+		 * generated in diff_file_stats_full_to_buf; namelen is the full length of
+		 * what will be printed, taking into account renames and common prefixes.
+		 */
 		delta = patch->delta;
-
-		/* TODO ugh */
 		namelen = strlen(delta->new_file.path);
-		if (delta->old_file.path && strcmp(delta->old_file.path, delta->new_file.path) != 0) {
-			namelen += strlen(delta->old_file.path);
-			stats->renames++;
+		if (delta->old_file.path &&
+		    strcmp(delta->old_file.path, delta->new_file.path) != 0) {
+			size_t common_dirlen;
+			if ((common_dirlen = git_fs_path_common_dirlen(delta->old_file.path, delta->new_file.path)) &&
+			    common_dirlen <= INT_MAX) {
+				namelen += strlen(delta->old_file.path) + 2 +
+				           strlen(DIFF_RENAME_FILE_SEPARATOR) - common_dirlen;
+			} else {
+				namelen += strlen(delta->old_file.path) +
+				           strlen(DIFF_RENAME_FILE_SEPARATOR);
+			}
 		}
 
 		/* and, of course, count the line stats */

data/vendor/libgit2/src/libgit2/fetchhead.c

@@ -106,7 +106,7 @@ static int fetchhead_ref_write(
 	git_fetchhead_ref *fetchhead_ref)
 {
 	char oid[GIT_OID_MAX_HEXSIZE + 1];
-	const char *type, *name;
+	const char *type = NULL, *name = NULL;
 	int head = 0;
 
 	GIT_ASSERT_ARG(file);

data/vendor/libgit2/src/libgit2/index.c

@@ -1225,7 +1225,7 @@ static int canonicalize_directory_path(
 {
 	const git_index_entry *match, *best = NULL;
 	char *search, *sep;
-	size_t pos, search_len, best_len;
+	size_t pos, search_len, best_len = 0;
 
 	if (!index->ignore_case)
 		return 0;
@@ -1448,7 +1448,7 @@ out:
 	return error;
 }
 
-static int index_conflict_to_reuc(git_index *index, const char *path)
+int git_index__conflict_to_reuc(git_index *index, const char *path)
 {
 	const git_index_entry *conflict_entries[3];
 	int ancestor_mode, our_mode, their_mode;
@@ -1528,7 +1528,7 @@ int git_index_add_from_buffer(
 		return error;
 
 	/* Adding implies conflict was resolved, move conflict entries to REUC */
-	if ((error = index_conflict_to_reuc(index, entry->path)) < 0 && error != GIT_ENOTFOUND)
+	if ((error = git_index__conflict_to_reuc(index, entry->path)) < 0 && error != GIT_ENOTFOUND)
 		return error;
 
 	git_tree_cache_invalidate_path(index->tree, entry->path);
@@ -1624,7 +1624,7 @@ int git_index_add_bypath(git_index *index, const char *path)
 	}
 
 	/* Adding implies conflict was resolved, move conflict entries to REUC */
-	if ((ret = index_conflict_to_reuc(index, path)) < 0 && ret != GIT_ENOTFOUND)
+	if ((ret = git_index__conflict_to_reuc(index, path)) < 0 && ret != GIT_ENOTFOUND)
 		return ret;
 
 	git_tree_cache_invalidate_path(index->tree, entry->path);
@@ -1640,7 +1640,7 @@ int git_index_remove_bypath(git_index *index, const char *path)
 
 	if (((ret = git_index_remove(index, path, 0)) < 0 &&
 		ret != GIT_ENOTFOUND) ||
-		((ret = index_conflict_to_reuc(index, path)) < 0 &&
+		((ret = git_index__conflict_to_reuc(index, path)) < 0 &&
 		ret != GIT_ENOTFOUND))
 		return ret;
 
@@ -2525,7 +2525,7 @@ static int read_entry(
 {
 	size_t path_length, path_offset, entry_size;
 	const char *path_ptr;
-	struct entry_common *source_common;
+	struct entry_common *source_common = NULL;
 	index_entry_short_sha1 source_sha1;
 #ifdef GIT_EXPERIMENTAL_SHA256
 	index_entry_short_sha256 source_sha256;
@@ -2877,7 +2877,7 @@ static int write_disk_entry(
 	const char *last)
 {
 	void *mem = NULL;
-	struct entry_common *ondisk_common;
+	struct entry_common *ondisk_common = NULL;
 	size_t path_len, path_offset, disk_size;
 	int varint_len = 0;
 	char *path;
@@ -2966,7 +2966,7 @@ static int write_disk_entry(
 	path_offset = index_entry_path_offset(index->oid_type, entry->flags);
 
 	if (entry->flags & GIT_INDEX_ENTRY_EXTENDED) {
-		struct entry_common *ondisk_ext;
+		struct entry_common *ondisk_ext = NULL;
 		uint16_t flags_extended = htons(entry->flags_extended &
 			GIT_INDEX_ENTRY_EXTENDED_FLAGS);
 

data/vendor/libgit2/src/libgit2/index.h

@@ -154,6 +154,9 @@ extern int git_index__open(
 	const char *index_path,
 	git_oid_t oid_type);
 
+/* If the path is conflicted, move it from the index to reuc. */
+int git_index__conflict_to_reuc(git_index *index, const char *path);
+
 /* Copy the current entries vector *and* increment the index refcount.
  * Call `git_index__release_snapshot` when done.
  */

data/vendor/libgit2/src/libgit2/indexer.c

@@ -24,10 +24,11 @@
 #include "object.h"
 #include "hashmap_oid.h"
 
-size_t git_indexer__max_objects = UINT32_MAX;
-
 #define UINT31_MAX (0x7FFFFFFF)
 
+size_t git_indexer__max_objects = UINT32_MAX;
+size_t git_indexer__max_object_size = UINT31_MAX;
+
 GIT_HASHMAP_OID_SETUP(git_indexer_oidmap, git_oid *);
 
 struct entry {
@@ -921,12 +922,12 @@ int git_indexer_append(git_indexer *idx, const void *data, size_t size, git_inde
 		if (git_vector_init(&idx->deltas, total_objects / 2, NULL) < 0)
 			return -1;
 
+		stats->total_objects = total_objects;
+		stats->indexed_objects = 0;
 		stats->received_objects = 0;
 		stats->local_objects = 0;
 		stats->total_deltas = 0;
 		stats->indexed_deltas = 0;
-		stats->indexed_objects = 0;
-		stats->total_objects = total_objects;
 
 		if ((error = do_progress_callback(idx, stats)) != 0)
 			return error;

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

@@ -936,7 +936,7 @@ static int merge_conflict_resolve_contents(
 	git_merge_file_result result = {0};
 	git_merge_driver *driver;
 	git_merge_driver__builtin builtin = {{0}};
-	git_index_entry *merge_result;
+	git_index_entry *merge_result = NULL;
 	git_odb *odb = NULL;
 	const char *name;
 	bool fallback = false;

data/vendor/libgit2/src/libgit2/merge.h

@@ -165,6 +165,10 @@ GIT_INLINE(const char *) git_merge_file__best_path(
 	if (!ancestor) {
 		if (ours && theirs && strcmp(ours, theirs) == 0)
 			return ours;
+		if (ours && !theirs)
+			return ours;
+		if (theirs && !ours)
+			return theirs;
 
 		return NULL;
 	}