rugged 1.5.1 → 1.6.2

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

@@ -11,16 +11,16 @@
  * The version string for libgit2.  This string follows semantic
  * versioning (v2) guidelines.
  */
-#define LIBGIT2_VERSION        "1.5.1"
+#define LIBGIT2_VERSION        "1.6.2"
 
 /** The major version number for this version of libgit2. */
 #define LIBGIT2_VER_MAJOR      1
 
 /** The minor version number for this version of libgit2. */
-#define LIBGIT2_VER_MINOR      5
+#define LIBGIT2_VER_MINOR      6
 
 /** The revision ("teeny") version number for this version of libgit2. */
-#define LIBGIT2_VER_REVISION   1
+#define LIBGIT2_VER_REVISION   2
 
 /** The Windows DLL patch number for this version of libgit2. */
 #define LIBGIT2_VER_PATCH      0
@@ -34,6 +34,6 @@
 #define LIBGIT2_VER_PRERELEASE NULL
 
 /** The library ABI soversion for this version of libgit2. */
-#define LIBGIT2_SOVERSION      "1.5"
+#define LIBGIT2_SOVERSION      "1.6"
 
 #endif

data/vendor/libgit2/include/git2.h

@@ -28,6 +28,7 @@
 #include "git2/diff.h"
 #include "git2/email.h"
 #include "git2/errors.h"
+#include "git2/experimental.h"
 #include "git2/filter.h"
 #include "git2/global.h"
 #include "git2/graph.h"

data/vendor/libgit2/src/CMakeLists.txt

@@ -170,12 +170,6 @@ if(ICONV_FOUND)
 endif()
 add_feature_info(iconv GIT_USE_ICONV "iconv encoding conversion support")
 
-#
-# Configure support
-#
-
-configure_file(features.h.in git2/sys/features.h)
-
 #
 # Include child projects
 #

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

@@ -1,8 +1,11 @@
 set(CLI_INCLUDES
-	"${libgit2_BINARY_DIR}/src"
+	"${libgit2_BINARY_DIR}/src/util"
+	"${libgit2_BINARY_DIR}/include"
+	"${libgit2_BINARY_DIR}/include/git2"
 	"${libgit2_SOURCE_DIR}/src/util"
 	"${libgit2_SOURCE_DIR}/src/cli"
-	"${libgit2_SOURCE_DIR}/include")
+	"${libgit2_SOURCE_DIR}/include"
+	"${LIBGIT2_DEPENDENCY_INCLUDES}")
 
 if(WIN32 AND NOT CYGWIN)
 	file(GLOB CLI_SRC_OS win32/*.c)
@@ -39,6 +42,7 @@ target_link_libraries(git2_cli ${CLI_LIBGIT2_LIBRARY} ${LIBGIT2_SYSTEM_LIBS})
 
 set_target_properties(git2_cli PROPERTIES C_STANDARD 90)
 set_target_properties(git2_cli PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${libgit2_BINARY_DIR})
+set_target_properties(git2_cli PROPERTIES OUTPUT_NAME ${LIBGIT2_FILENAME})
 
 ide_split_sources(git2_cli)
 

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

@@ -49,23 +49,39 @@ static void print_help(void)
 	cli_opt_help_fprint(stdout, opts);
 }
 
-static int hash_buf(git_odb *odb, git_str *buf, git_object_t type)
+static int hash_buf(
+	git_odb *odb,
+	git_str *buf,
+	git_object_t object_type,
+	git_oid_t oid_type)
 {
 	git_oid oid;
 
 	if (!literally) {
 		int valid = 0;
 
-		if (git_object_rawcontent_is_valid(&valid, buf->ptr, buf->size, type) < 0 || !valid)
+#ifdef GIT_EXPERIMENTAL_SHA256
+		if (git_object_rawcontent_is_valid(&valid, buf->ptr, buf->size, object_type, oid_type) < 0 || !valid)
 			return cli_error_git();
+#else
+		GIT_UNUSED(oid_type);
+
+		if (git_object_rawcontent_is_valid(&valid, buf->ptr, buf->size, object_type) < 0 || !valid)
+			return cli_error_git();
+#endif
 	}
 
 	if (write_object) {
-		if (git_odb_write(&oid, odb, buf->ptr, buf->size, type) < 0)
+		if (git_odb_write(&oid, odb, buf->ptr, buf->size, object_type) < 0)
 			return cli_error_git();
 	} else {
-		if (git_odb_hash(&oid, buf->ptr, buf->size, type) < 0)
+#ifdef GIT_EXPERIMENTAL_SHA256
+		if (git_odb_hash(&oid, buf->ptr, buf->size, object_type, GIT_OID_SHA1) < 0)
 			return cli_error_git();
+#else
+		if (git_odb_hash(&oid, buf->ptr, buf->size, object_type) < 0)
+			return cli_error_git();
+#endif
 	}
 
 	if (printf("%s\n", git_oid_tostr_s(&oid)) < 0)
@@ -78,9 +94,10 @@ int cmd_hash_object(int argc, char **argv)
 {
 	git_repository *repo = NULL;
 	git_odb *odb = NULL;
+	git_oid_t oid_type;
 	git_str buf = GIT_STR_INIT;
 	cli_opt invalid_opt;
-	git_object_t type = GIT_OBJECT_BLOB;
+	git_object_t object_type = GIT_OBJECT_BLOB;
 	char **filename;
 	int ret = 0;
 
@@ -92,7 +109,7 @@ int cmd_hash_object(int argc, char **argv)
 		return 0;
 	}
 
-	if (type_name && (type = git_object_string2type(type_name)) == GIT_OBJECT_INVALID)
+	if (type_name && (object_type = git_object_string2type(type_name)) == GIT_OBJECT_INVALID)
 		return cli_error_usage("invalid object type '%s'", type_name);
 
 	if (write_object &&
@@ -102,6 +119,8 @@ int cmd_hash_object(int argc, char **argv)
 		goto done;
 	}
 
+	oid_type = git_repository_oid_type(repo);
+
 	/*
 	 * TODO: we're reading blobs, we shouldn't pull them all into main
 	 * memory, we should just stream them into the odb instead.
@@ -113,7 +132,7 @@ int cmd_hash_object(int argc, char **argv)
 			goto done;
 		}
 
-		if ((ret = hash_buf(odb, &buf, type)) != 0)
+		if ((ret = hash_buf(odb, &buf, object_type, oid_type)) != 0)
 			goto done;
 	} else {
 		for (filename = filenames; *filename; filename++) {
@@ -122,7 +141,7 @@ int cmd_hash_object(int argc, char **argv)
 				goto done;
 			}
 
-			if ((ret = hash_buf(odb, &buf, type)) != 0)
+			if ((ret = hash_buf(odb, &buf, object_type, oid_type)) != 0)
 				goto done;
 		}
 	}

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

@@ -23,7 +23,7 @@
 #include "opt.h"
 
 #ifdef _WIN32
-# include <Windows.h>
+# include <windows.h>
 #else
 # include <fcntl.h>
 # include <sys/ioctl.h>

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

@@ -8,21 +8,13 @@ set_target_properties(libgit2 PROPERTIES C_EXTENSIONS OFF)
 include(PkgBuildConfig)
 
 set(LIBGIT2_INCLUDES
-	"${PROJECT_BINARY_DIR}/src"
+	"${PROJECT_BINARY_DIR}/src/util"
+	"${PROJECT_BINARY_DIR}/include"
+	"${PROJECT_BINARY_DIR}/include/git2"
 	"${PROJECT_SOURCE_DIR}/src/libgit2"
 	"${PROJECT_SOURCE_DIR}/src/util"
 	"${PROJECT_SOURCE_DIR}/include")
 
-if(WIN32 AND EMBED_SSH_PATH)
-	file(GLOB SRC_SSH "${EMBED_SSH_PATH}/src/*.c")
-	list(SORT SRC_SSH)
-	target_sources(libgit2 PRIVATE ${SRC_SSH})
-
-	list(APPEND LIBGIT2_SYSTEM_INCLUDES "${EMBED_SSH_PATH}/include")
-	file(WRITE "${EMBED_SSH_PATH}/src/libssh2_config.h" "#define HAVE_WINCNG\n#define LIBSSH2_WINCNG\n#include \"../win32/libssh2_config.h\"")
-	set(GIT_SSH 1)
-endif()
-
 # Collect sourcefiles
 file(GLOB SRC_H
 	"${PROJECT_SOURCE_DIR}/include/git2.h"
@@ -67,6 +59,7 @@ endif()
 
 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 SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES})
@@ -84,6 +77,7 @@ set(LIBGIT2_SYSTEM_LIBS ${LIBGIT2_SYSTEM_LIBS} PARENT_SCOPE)
 
 add_library(libgit2package ${SRC_RC} ${LIBGIT2_OBJECTS})
 target_link_libraries(libgit2package ${LIBGIT2_SYSTEM_LIBS})
+target_include_directories(libgit2package SYSTEM PRIVATE ${LIBGIT2_INCLUDES})
 
 set_target_properties(libgit2package PROPERTIES C_STANDARD 90)
 set_target_properties(libgit2package PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
@@ -109,10 +103,10 @@ if(SONAME)
 	endif()
 endif()
 
-pkg_build_config(NAME libgit2
+pkg_build_config(NAME "lib${LIBGIT2_FILENAME}"
 	VERSION ${libgit2_VERSION}
 	DESCRIPTION "The git library, take 2"
-	LIBS_SELF git2
+	LIBS_SELF ${LIBGIT2_FILENAME}
 	PRIVATE_LIBS ${LIBGIT2_PC_LIBS}
 	REQUIRES ${LIBGIT2_PC_REQUIRES})
 
@@ -122,10 +116,26 @@ if(MSVC_IDE)
 	set_source_files_properties(win32/precompiled.c COMPILE_FLAGS "/Ycprecompiled.h")
 endif()
 
+# support experimental features and functionality
+
+configure_file(experimental.h.in "${PROJECT_BINARY_DIR}/include/git2/experimental.h")
+
+# translate filenames in the git2.h 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})
+
 # Install
+
 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})
-install(FILES ${PROJECT_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+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})

data/vendor/libgit2/src/libgit2/annotated_commit.c

@@ -40,7 +40,7 @@ static int annotated_commit_init(
 		goto done;
 
 	git_oid_fmt(annotated_commit->id_str, git_commit_id(commit));
-	annotated_commit->id_str[GIT_OID_HEXSZ] = '\0';
+	annotated_commit->id_str[GIT_OID_SHA1_HEXSIZE] = '\0';
 
 	if (!description)
 		description = annotated_commit->id_str;

data/vendor/libgit2/src/libgit2/annotated_commit.h

@@ -41,7 +41,7 @@ struct git_annotated_commit {
 	const char *ref_name;
 	const char *remote_url;
 
-	char id_str[GIT_OID_HEXSZ+1];
+	char id_str[GIT_OID_SHA1_HEXSIZE+1];
 };
 
 extern int git_annotated_commit_from_head(git_annotated_commit **out,

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

@@ -135,7 +135,7 @@ int git_attr_file__load(
 		break;
 	case GIT_ATTR_FILE_SOURCE_INDEX: {
 		if ((error = attr_file_oid_from_index(&id, repo, entry->path)) < 0 ||
-			(error = git_blob_lookup(&blob, repo, &id)) < 0)
+		    (error = git_blob_lookup(&blob, repo, &id)) < 0)
 			return error;
 
 		/* Do not assume that data straight from the ODB is NULL-terminated;

data/vendor/libgit2/src/libgit2/attrcache.c

@@ -300,7 +300,7 @@ static int attr_cache__lookup_path(
 
 		/* expand leading ~/ as needed */
 		if (cfgval && cfgval[0] == '~' && cfgval[1] == '/') {
-			if (! (error = git_sysdir_expand_global_file(&buf, &cfgval[2])))
+			if (! (error = git_sysdir_expand_homedir_file(&buf, &cfgval[2])))
 				*out = git_str_detach(&buf);
 		} else if (cfgval) {
 			*out = git__strdup(cfgval);

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

@@ -72,6 +72,8 @@ static git_blame_hunk *new_hunk(
 	hunk->final_start_line_number = start;
 	hunk->orig_start_line_number = orig_start;
 	hunk->orig_path = path ? git__strdup(path) : NULL;
+	git_oid_clear(&hunk->orig_commit_id, GIT_OID_SHA1);
+	git_oid_clear(&hunk->final_commit_id, GIT_OID_SHA1);
 
 	return hunk;
 }

data/vendor/libgit2/src/libgit2/blob.c

@@ -52,11 +52,12 @@ void git_blob__free(void *_blob)
 	git__free(blob);
 }
 
-int git_blob__parse_raw(void *_blob, const char *data, size_t size)
+int git_blob__parse_raw(void *_blob, const char *data, size_t size, git_oid_t oid_type)
 {
 	git_blob *blob = (git_blob *) _blob;
 
 	GIT_ASSERT_ARG(blob);
+	GIT_UNUSED(oid_type);
 
 	blob->raw = 1;
 	blob->data.raw.data = data;
@@ -64,11 +65,12 @@ int git_blob__parse_raw(void *_blob, const char *data, size_t size)
 	return 0;
 }
 
-int git_blob__parse(void *_blob, git_odb_object *odb_obj)
+int git_blob__parse(void *_blob, git_odb_object *odb_obj, git_oid_t oid_type)
 {
 	git_blob *blob = (git_blob *) _blob;
 
 	GIT_ASSERT_ARG(blob);
+	GIT_UNUSED(oid_type);
 
 	git_cached_obj_incref((git_cached_obj *)odb_obj);
 	blob->raw = 0;

data/vendor/libgit2/src/libgit2/blob.h

@@ -36,8 +36,8 @@ struct git_blob {
 	} while(0)
 
 void git_blob__free(void *blob);
-int git_blob__parse(void *blob, git_odb_object *obj);
-int git_blob__parse_raw(void *blob, const char *data, size_t size);
+int git_blob__parse(void *blob, git_odb_object *obj, git_oid_t oid_type);
+int git_blob__parse_raw(void *blob, const char *data, size_t size, git_oid_t oid_type);
 int git_blob__getbuf(git_str *buffer, git_blob *blob);
 
 extern int git_blob__create_from_paths(

data/vendor/libgit2/src/libgit2/branch.c

@@ -134,9 +134,9 @@ int git_branch_create(
 	const git_commit *commit,
 	int force)
 {
-	char commit_id[GIT_OID_HEXSZ + 1];
+	char commit_id[GIT_OID_SHA1_HEXSIZE + 1];
 
-	git_oid_tostr(commit_id, GIT_OID_HEXSZ + 1, git_commit_id(commit));
+	git_oid_tostr(commit_id, GIT_OID_SHA1_HEXSIZE + 1, git_commit_id(commit));
 	return create_branch(ref_out, repository, branch_name, commit, commit_id, force);
 }
 

data/vendor/libgit2/src/libgit2/cherrypick.c

@@ -106,10 +106,10 @@ static int cherrypick_state_cleanup(git_repository *repo)
 
 static int cherrypick_seterr(git_commit *commit, const char *fmt)
 {
-	char commit_oidstr[GIT_OID_HEXSZ + 1];
+	char commit_oidstr[GIT_OID_SHA1_HEXSIZE + 1];
 
 	git_error_set(GIT_ERROR_CHERRYPICK, fmt,
-		git_oid_tostr(commit_oidstr, GIT_OID_HEXSZ + 1, git_commit_id(commit)));
+		git_oid_tostr(commit_oidstr, GIT_OID_SHA1_HEXSIZE + 1, git_commit_id(commit)));
 
 	return -1;
 }
@@ -173,7 +173,7 @@ int git_cherrypick(
 	git_cherrypick_options opts;
 	git_reference *our_ref = NULL;
 	git_commit *our_commit = NULL;
-	char commit_oidstr[GIT_OID_HEXSZ + 1];
+	char commit_oidstr[GIT_OID_SHA1_HEXSIZE + 1];
 	const char *commit_msg, *commit_summary;
 	git_str their_label = GIT_STR_INIT;
 	git_index *index = NULL;

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

@@ -282,7 +282,11 @@ static int update_head_to_branch(
 			reflog_message)) < 0)
 		goto cleanup;
 
-	if ((retcode = git_remote__default_branch(&default_branch, remote)) < 0)
+	retcode = git_remote__default_branch(&default_branch, remote);
+
+	if (retcode == GIT_ENOTFOUND)
+		retcode = 0;
+	else if (retcode)
 		goto cleanup;
 
 	if (!git_remote__matching_refspec(remote, git_str_cstr(&default_branch)))
@@ -389,12 +393,19 @@ static int checkout_branch(git_repository *repo, git_remote *remote, const git_c
 	return error;
 }
 
-static int clone_into(git_repository *repo, git_remote *_remote, const git_fetch_options *opts, const git_checkout_options *co_opts, const char *branch)
+static int clone_into(
+	git_repository *repo,
+	git_remote *_remote,
+	const git_fetch_options *opts,
+	const git_checkout_options *co_opts,
+	const char *branch)
 {
 	int error;
 	git_str reflog_message = GIT_STR_INIT;
+	git_remote_connect_options connect_opts = GIT_REMOTE_CONNECT_OPTIONS_INIT;
 	git_fetch_options fetch_opts;
 	git_remote *remote;
+	git_oid_t oid_type;
 
 	GIT_ASSERT_ARG(repo);
 	GIT_ASSERT_ARG(_remote);
@@ -410,8 +421,25 @@ static int clone_into(git_repository *repo, git_remote *_remote, const git_fetch
 	memcpy(&fetch_opts, opts, sizeof(git_fetch_options));
 	fetch_opts.update_fetchhead = 0;
 	fetch_opts.download_tags = GIT_REMOTE_DOWNLOAD_TAGS_ALL;
+
+	if ((error = git_remote_connect_options__from_fetch_opts(&connect_opts, remote, &fetch_opts)) < 0)
+		goto cleanup;
+
 	git_str_printf(&reflog_message, "clone: from %s", git_remote_url(remote));
 
+	/*
+	 * Connect to the server so that we can identify the remote
+	 * object format.
+	 */
+
+	if ((error = git_remote_connect_ext(remote, GIT_DIRECTION_FETCH,
+			&connect_opts)) < 0)
+		goto cleanup;
+
+	if ((error = git_remote_oid_type(&oid_type, remote)) < 0 ||
+	    (error = git_repository__set_objectformat(repo, oid_type)) < 0)
+		goto cleanup;
+
 	if ((error = git_remote_fetch(remote, NULL, &fetch_opts, git_str_cstr(&reflog_message))) != 0)
 		goto cleanup;
 
@@ -419,6 +447,7 @@ static int clone_into(git_repository *repo, git_remote *_remote, const git_fetch
 
 cleanup:
 	git_remote_free(remote);
+	git_remote_connect_options_dispose(&connect_opts);
 	git_str_dispose(&reflog_message);
 
 	return error;

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

@@ -56,11 +56,13 @@ static int git_commit__create_buffer_internal(
 	GIT_ASSERT_ARG(out);
 	GIT_ASSERT_ARG(tree);
 
-	git_oid__writebuf(out, "tree ", tree);
+	if (git_object__write_oid_header(out, "tree ", tree) < 0)
+		goto on_error;
 
 	for (i = 0; i < git_array_size(*parents); i++) {
 		parent = git_array_get(*parents, i);
-		git_oid__writebuf(out, "parent ", parent);
+		if (git_object__write_oid_header(out, "parent ", parent) < 0)
+			goto on_error;
 	}
 
 	git_signature__writebuf(out, "author ", author);
@@ -388,7 +390,11 @@ int git_commit_amend(
 	return error;
 }
 
-static int commit_parse(git_commit *commit, const char *data, size_t size, unsigned int flags)
+static int commit_parse(
+	git_commit *commit,
+	const char *data,
+	size_t size,
+	git_commit__parse_options *opts)
 {
 	const char *buffer_start = data, *buffer;
 	const char *buffer_end = buffer_start + size;
@@ -399,6 +405,7 @@ static int commit_parse(git_commit *commit, const char *data, size_t size, unsig
 
 	GIT_ASSERT_ARG(commit);
 	GIT_ASSERT_ARG(data);
+	GIT_ASSERT_ARG(opts);
 
 	buffer = buffer_start;
 
@@ -407,11 +414,14 @@ static int commit_parse(git_commit *commit, const char *data, size_t size, unsig
 	GIT_ERROR_CHECK_ARRAY(commit->parent_ids);
 
 	/* The tree is always the first field */
-	if (!(flags & GIT_COMMIT_PARSE_QUICK)) {
-	    if (git_oid__parse(&commit->tree_id, &buffer, buffer_end, "tree ") < 0)
+	if (!(opts->flags & GIT_COMMIT_PARSE_QUICK)) {
+		if (git_object__parse_oid_header(&commit->tree_id,
+				&buffer, buffer_end, "tree ",
+				opts->oid_type) < 0)
 			goto bad_buffer;
 	} else {
-		size_t tree_len = strlen("tree ") + GIT_OID_HEXSZ + 1;
+		size_t tree_len = strlen("tree ") + git_oid_hexsize(opts->oid_type) + 1;
+
 		if (buffer + tree_len > buffer_end)
 			goto bad_buffer;
 		buffer += tree_len;
@@ -421,14 +431,16 @@ static int commit_parse(git_commit *commit, const char *data, size_t size, unsig
 	 * TODO: commit grafts!
 	 */
 
-	while (git_oid__parse(&parent_id, &buffer, buffer_end, "parent ") == 0) {
+	while (git_object__parse_oid_header(&parent_id,
+			&buffer, buffer_end, "parent ",
+			opts->oid_type) == 0) {
 		git_oid *new_id = git_array_alloc(commit->parent_ids);
 		GIT_ERROR_CHECK_ALLOC(new_id);
 
 		git_oid_cpy(new_id, &parent_id);
 	}
 
-	if (!(flags & GIT_COMMIT_PARSE_QUICK)) {
+	if (!opts || !(opts->flags & GIT_COMMIT_PARSE_QUICK)) {
 		commit->author = git__malloc(sizeof(git_signature));
 		GIT_ERROR_CHECK_ALLOC(commit->author);
 
@@ -452,7 +464,7 @@ static int commit_parse(git_commit *commit, const char *data, size_t size, unsig
 	if ((error = git_signature__parse(commit->committer, &buffer, buffer_end, "committer ", '\n')) < 0)
 		return error;
 
-	if (flags & GIT_COMMIT_PARSE_QUICK)
+	if (opts && opts->flags & GIT_COMMIT_PARSE_QUICK)
 		return 0;
 
 	/* Parse add'l header entries */
@@ -497,19 +509,39 @@ bad_buffer:
 	return GIT_EINVALID;
 }
 
-int git_commit__parse_raw(void *commit, const char *data, size_t size)
+int git_commit__parse(
+	void *commit,
+	git_odb_object *odb_obj,
+	git_oid_t oid_type)
 {
-	return commit_parse(commit, data, size, 0);
+	git_commit__parse_options parse_options = {0};
+	parse_options.oid_type = oid_type;
+
+	return git_commit__parse_ext(commit, odb_obj, &parse_options);
 }
 
-int git_commit__parse_ext(git_commit *commit, git_odb_object *odb_obj, unsigned int flags)
+int git_commit__parse_raw(
+	void *commit,
+	const char *data,
+	size_t size,
+	git_oid_t oid_type)
 {
-	return commit_parse(commit, git_odb_object_data(odb_obj), git_odb_object_size(odb_obj), flags);
+	git_commit__parse_options parse_options = {0};
+	parse_options.oid_type = oid_type;
+
+	return commit_parse(commit, data, size, &parse_options);
 }
 
-int git_commit__parse(void *_commit, git_odb_object *odb_obj)
+int git_commit__parse_ext(
+	git_commit *commit,
+	git_odb_object *odb_obj,
+	git_commit__parse_options *parse_opts)
 {
-	return git_commit__parse_ext(_commit, odb_obj, 0);
+	return commit_parse(
+		commit,
+		git_odb_object_data(odb_obj),
+		git_odb_object_size(odb_obj),
+		parse_opts);
 }
 
 #define GIT_COMMIT_GETTER(_rvalue, _name, _return, _invalid) \
@@ -566,7 +598,7 @@ const char *git_commit_summary(git_commit *commit)
 				while (*next && git__isspace_nonlf(*next)) {
 					++next;
 				}
-				if (!*next || *next == '\n') 
+				if (!*next || *next == '\n')
 					break;
 			}
 			/* record the beginning of contiguous whitespace runs */
@@ -979,11 +1011,14 @@ int git_commit_create_with_signature(
 	git_str commit = GIT_STR_INIT;
 	git_commit *parsed;
 	git_array_oid_t parents = GIT_ARRAY_INIT;
+	git_commit__parse_options parse_opts = {0};
+
+	parse_opts.oid_type = repo->oid_type;
 
 	/* The first step is to verify that all the tree and parents exist */
 	parsed = git__calloc(1, sizeof(git_commit));
 	GIT_ERROR_CHECK_ALLOC(parsed);
-	if (commit_parse(parsed, commit_content, strlen(commit_content), 0) < 0) {
+	if (commit_parse(parsed, commit_content, strlen(commit_content), &parse_opts) < 0) {
 		error = -1;
 		goto cleanup;
 	}

data/vendor/libgit2/src/libgit2/commit.h

@@ -33,6 +33,16 @@ struct git_commit {
 	char *body;
 };
 
+typedef struct {
+	git_oid_t oid_type;
+	unsigned int flags;
+} git_commit__parse_options;
+
+typedef enum {
+	/** Only parse parents and committer info */
+	GIT_COMMIT_PARSE_QUICK = (1 << 0)
+} git_commit__parse_flags;
+
 int git_commit__header_field(
 	git_str *out,
 	const git_commit *commit,
@@ -56,14 +66,22 @@ int git_commit__create_buffer(
 	size_t parent_count,
 	const git_commit *parents[]);
 
-void git_commit__free(void *commit);
-int git_commit__parse(void *commit, git_odb_object *obj);
-int git_commit__parse_raw(void *commit, const char *data, size_t size);
+int git_commit__parse(
+	void *commit,
+	git_odb_object *obj,
+	git_oid_t oid_type);
 
-typedef enum {
-	GIT_COMMIT_PARSE_QUICK = (1 << 0) /**< Only parse parents and committer info */
-} git_commit__parse_flags;
+int git_commit__parse_raw(
+	void *commit,
+	const char *data,
+	size_t size,
+	git_oid_t oid_type);
 
-int git_commit__parse_ext(git_commit *commit, git_odb_object *odb_obj, unsigned int flags);
+int git_commit__parse_ext(
+	git_commit *commit,
+	git_odb_object *odb_obj,
+	git_commit__parse_options *parse_opts);
+
+void git_commit__free(void *commit);
 
 #endif