refactor: `src` is now `src/libgit2`

361 files changed, 343 insertions, 301 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e7b54d036..f6924eff5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,307 +1,10 @@
-add_library(git2internal OBJECT)
-set_target_properties(git2internal PROPERTIES C_STANDARD 90)
-set_target_properties(git2internal PROPERTIES C_EXTENSIONS OFF)
-
-
-if(DEPRECATE_HARD)
-        add_definitions(-DGIT_DEPRECATE_HARD)
-endif()
-
-if(DEBUG_POOL)
-	set(GIT_DEBUG_POOL 1)
-endif()
-add_feature_info(debugpool GIT_DEBUG_POOL "debug pool allocator")
-
-if(DEBUG_STRICT_ALLOC)
-	set(GIT_DEBUG_STRICT_ALLOC 1)
-endif()
-add_feature_info(debugalloc GIT_DEBUG_STRICT_ALLOC "debug strict allocators")
-
-if(DEBUG_STRICT_OPEN)
-	set(GIT_DEBUG_STRICT_OPEN 1)
-endif()
-add_feature_info(debugopen GIT_DEBUG_STRICT_OPEN "path validation in open")
-
-
-include(PkgBuildConfig)
-include(SanitizeBool)
-
-# This variable will contain the libraries we need to put into
-# libgit2.pc's Requires.private. That is, what we're linking to or
-# what someone who's statically linking us needs to link to.
-set(LIBGIT2_PC_REQUIRES "")
-# This will be set later if we use the system's http-parser library or
-# use iconv (OSX) and will be written to the Libs.private field in the
-# pc file.
-set(LIBGIT2_PC_LIBS "")
-
-set(LIBGIT2_INCLUDES
-	"${CMAKE_CURRENT_BINARY_DIR}"
-	"${PROJECT_SOURCE_DIR}/src"
-	"${PROJECT_SOURCE_DIR}/include")
-
-if(HAVE_FUTIMENS)
-	set(GIT_USE_FUTIMENS 1)
-endif ()
-add_feature_info(futimens GIT_USE_FUTIMENS "futimens support")
-
-check_prototype_definition(qsort_r
-	"void qsort_r(void *base, size_t nmemb, size_t size, void *thunk, int (*compar)(void *, const void *, const void *))"
-	"" "stdlib.h" GIT_QSORT_R_BSD)
-
-check_prototype_definition(qsort_r
-	"void qsort_r(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *arg)"
-	"" "stdlib.h" GIT_QSORT_R_GNU)
-
-check_function_exists(qsort_s GIT_QSORT_S)
-
-check_function_exists(getentropy GIT_RAND_GETENTROPY)
-
-# Find required dependencies
-
-if(WIN32)
-	list(APPEND LIBGIT2_SYSTEM_LIBS ws2_32)
-elseif(CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
-	list(APPEND LIBGIT2_SYSTEM_LIBS socket nsl)
-	list(APPEND LIBGIT2_PC_LIBS "-lsocket" "-lnsl")
-elseif(CMAKE_SYSTEM_NAME MATCHES "Haiku")
-	list(APPEND LIBGIT2_SYSTEM_LIBS network)
-	list(APPEND LIBGIT2_PC_LIBS "-lnetwork")
-endif()
-
-check_library_exists(rt clock_gettime "time.h" NEED_LIBRT)
-if(NEED_LIBRT)
-	list(APPEND LIBGIT2_SYSTEM_LIBS rt)
-	list(APPEND LIBGIT2_PC_LIBS "-lrt")
-endif()
-
-if(USE_THREADS)
-	list(APPEND LIBGIT2_SYSTEM_LIBS ${CMAKE_THREAD_LIBS_INIT})
-	list(APPEND LIBGIT2_PC_LIBS ${CMAKE_THREAD_LIBS_INIT})
-endif()
-add_feature_info(threadsafe USE_THREADS "threadsafe support")
-
-
-if(WIN32 AND EMBED_SSH_PATH)
-	file(GLOB SRC_SSH "${EMBED_SSH_PATH}/src/*.c")
-	list(SORT SRC_SSH)
-	target_sources(git2internal 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()
-
-include(SelectHTTPSBackend)
-include(SelectHashes)
-include(SelectHTTPParser)
-include(SelectRegex)
-include(SelectSSH)
-include(SelectWinHTTP)
-include(SelectZlib)
-
-
-if(USE_SHA1 STREQUAL "CollisionDetection")
-	file(GLOB SRC_SHA1 hash/sha1/collisiondetect.* hash/sha1/sha1dc/*)
-elseif(USE_SHA1 STREQUAL "OpenSSL")
-	file(GLOB SRC_SHA1 hash/sha1/openssl.*)
-elseif(USE_SHA1 STREQUAL "CommonCrypto")
-	file(GLOB SRC_SHA1 hash/sha1/common_crypto.*)
-elseif(USE_SHA1 STREQUAL "mbedTLS")
-	file(GLOB SRC_SHA1 hash/sha1/mbedtls.*)
-elseif(USE_SHA1 STREQUAL "Win32")
-	file(GLOB SRC_SHA1 hash/sha1/win32.*)
-elseif(USE_SHA1 STREQUAL "Generic")
-	file(GLOB SRC_SHA1 hash/sha1/generic.*)
-endif()
-list(APPEND SRC_SHA1 "hash/sha1.h")
-target_sources(git2internal PRIVATE ${SRC_SHA1})
-
-# Optional external dependency: ntlmclient
-if(USE_NTLMCLIENT)
-	set(GIT_NTLM 1)
-	add_subdirectory("${PROJECT_SOURCE_DIR}/deps/ntlmclient" "${PROJECT_BINARY_DIR}/deps/ntlmclient")
-	list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${PROJECT_SOURCE_DIR}/deps/ntlmclient")
-	list(APPEND LIBGIT2_DEPENDENCY_OBJECTS "$<TARGET_OBJECTS:ntlmclient>")
-endif()
-add_feature_info(ntlmclient GIT_NTLM "NTLM authentication support for Unix")
-
-# Optional external dependency: GSSAPI
-
-include(SelectGSSAPI)
-
-# Optional external dependency: iconv
-if(USE_ICONV)
-	find_package(Iconv)
-endif()
-if(ICONV_FOUND)
-	set(GIT_USE_ICONV 1)
-	list(APPEND LIBGIT2_SYSTEM_INCLUDES ${ICONV_INCLUDE_DIR})
-	list(APPEND LIBGIT2_SYSTEM_LIBS ${ICONV_LIBRARIES})
-	list(APPEND LIBGIT2_PC_LIBS ${ICONV_LIBRARIES})
-endif()
-add_feature_info(iconv GIT_USE_ICONV "iconv encoding conversion support")
-
-
-if(USE_THREADS)
-	if(NOT WIN32)
-		find_package(Threads REQUIRED)
-	endif()
-
-	set(GIT_THREADS 1)
-endif()
-
-if(USE_NSEC)
-	set(GIT_USE_NSEC 1)
-endif()
-
-if(HAVE_STRUCT_STAT_ST_MTIM)
-	set(GIT_USE_STAT_MTIM 1)
-elseif(HAVE_STRUCT_STAT_ST_MTIMESPEC)
-	set(GIT_USE_STAT_MTIMESPEC 1)
-elseif(HAVE_STRUCT_STAT_ST_MTIME_NSEC)
-	set(GIT_USE_STAT_MTIME_NSEC 1)
-endif()
-
-target_compile_definitions(git2internal PRIVATE _FILE_OFFSET_BITS=64)
-
-# Collect sourcefiles
-file(GLOB SRC_H
-	"${PROJECT_SOURCE_DIR}/include/git2.h"
-	"${PROJECT_SOURCE_DIR}/include/git2/*.h"
-	"${PROJECT_SOURCE_DIR}/include/git2/sys/*.h")
-list(SORT SRC_H)
-target_sources(git2internal PRIVATE ${SRC_H})
-
-# On Windows use specific platform sources
-if(WIN32 AND NOT CYGWIN)
-	set(WIN_RC "win32/git2.rc")
-
-	file(GLOB SRC_OS win32/*.c win32/*.h)
-	list(SORT SRC_OS)
-	target_sources(git2internal PRIVATE ${SRC_OS})
-elseif(AMIGA)
-	target_compile_definitions(git2internal PRIVATE NO_ADDRINFO NO_READDIR_R NO_MMAP)
-else()
-	file(GLOB SRC_OS unix/*.c unix/*.h)
-	list(SORT SRC_OS)
-	target_sources(git2internal PRIVATE ${SRC_OS})
-endif()
-
-if(USE_LEAK_CHECKER STREQUAL "valgrind")
-	target_compile_definitions(git2internal PRIVATE VALGRIND)
-endif()
-
-file(GLOB SRC_GIT2 *.c *.h
-	allocators/*.c allocators/*.h
-	streams/*.c streams/*.h
-	transports/*.c transports/*.h
-	xdiff/*.c xdiff/*.h)
-list(SORT SRC_GIT2)
-target_sources(git2internal PRIVATE ${SRC_GIT2})
-
-if(APPLE)
-	# The old Secure Transport API has been deprecated in macOS 10.15.
-	set_source_files_properties(streams/stransport.c PROPERTIES COMPILE_FLAGS -Wno-deprecated)
-endif()
-
-# the xdiff dependency is not (yet) warning-free, disable warnings as
-# errors for the xdiff sources until we've sorted them out
-if(MSVC)
-	set_source_files_properties(xdiff/xdiffi.c PROPERTIES COMPILE_FLAGS -WX-)
-	set_source_files_properties(xdiff/xemit.c PROPERTIES COMPILE_FLAGS -WX-)
-	set_source_files_properties(xdiff/xhistogram.c PROPERTIES COMPILE_FLAGS -WX-)
-	set_source_files_properties(xdiff/xmerge.c PROPERTIES COMPILE_FLAGS -WX-)
-	set_source_files_properties(xdiff/xutils.c PROPERTIES COMPILE_FLAGS -WX-)
-	set_source_files_properties(xdiff/xpatience.c PROPERTIES COMPILE_FLAGS -WX-)
-else()
-	set_source_files_properties(xdiff/xdiffi.c PROPERTIES COMPILE_FLAGS "-Wno-sign-compare -Wno-unused-parameter")
-	set_source_files_properties(xdiff/xemit.c PROPERTIES COMPILE_FLAGS "-Wno-sign-compare -Wno-unused-parameter")
-	set_source_files_properties(xdiff/xhistogram.c PROPERTIES COMPILE_FLAGS "-Wno-sign-compare")
-	set_source_files_properties(xdiff/xutils.c PROPERTIES COMPILE_FLAGS "-Wno-sign-compare")
-	set_source_files_properties(xdiff/xpatience.c PROPERTIES COMPILE_FLAGS "-Wno-sign-compare")
-endif()
-
-# Determine architecture of the machine
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	set(GIT_ARCH_64 1)
-elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-	set(GIT_ARCH_32 1)
-elseif(CMAKE_SIZEOF_VOID_P)
-	message(FATAL_ERROR "Unsupported architecture (pointer size is ${CMAKE_SIZEOF_VOID_P} bytes)")
-else()
-	message(FATAL_ERROR "Unsupported architecture (CMAKE_SIZEOF_VOID_P is unset)")
-endif()
-
-configure_file(features.h.in git2/sys/features.h)
-
-ide_split_sources(git2internal)
-list(APPEND LIBGIT2_OBJECTS $<TARGET_OBJECTS:git2internal> ${LIBGIT2_DEPENDENCY_OBJECTS})
-
-target_include_directories(git2internal PRIVATE ${LIBGIT2_INCLUDES} ${LIBGIT2_DEPENDENCY_INCLUDES} PUBLIC ${PROJECT_SOURCE_DIR}/include)
-target_include_directories(git2internal SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES})
+add_subdirectory(libgit2)
 
+# re-export these to the root so that peer projects (tests, fuzzers,
+# examples) can use them
 set(LIBGIT2_INCLUDES ${LIBGIT2_INCLUDES} PARENT_SCOPE)
 set(LIBGIT2_OBJECTS ${LIBGIT2_OBJECTS} PARENT_SCOPE)
 set(LIBGIT2_DEPENDENCY_INCLUDES ${LIBGIT2_DEPENDENCY_INCLUDES} PARENT_SCOPE)
 set(LIBGIT2_DEPENDENCY_OBJECTS ${LIBGIT2_DEPENDENCY_OBJECTS} PARENT_SCOPE)
 set(LIBGIT2_SYSTEM_INCLUDES ${LIBGIT2_SYSTEM_INCLUDES} PARENT_SCOPE)
 set(LIBGIT2_SYSTEM_LIBS ${LIBGIT2_SYSTEM_LIBS} PARENT_SCOPE)
-
-if(XCODE_VERSION)
-	# This is required for Xcode to actually link the libgit2 library
-	# when using only object libraries.
-	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.c "")
-	list(APPEND LIBGIT2_OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/dummy.c)
-endif()
-
-# Compile and link libgit2
-add_library(git2 ${WIN_RC} ${LIBGIT2_OBJECTS})
-target_link_libraries(git2 ${LIBGIT2_SYSTEM_LIBS})
-
-set_target_properties(git2 PROPERTIES C_STANDARD 90)
-set_target_properties(git2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
-set_target_properties(git2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
-set_target_properties(git2 PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
-
-# Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240)
-# Win64+MSVC+static libs = linker error
-if(MSVC AND GIT_ARCH_64 AND NOT BUILD_SHARED_LIBS)
-	set_target_properties(git2 PROPERTIES STATIC_LIBRARY_FLAGS "/MACHINE:x64")
-endif()
-
-ide_split_sources(git2)
-
-if(SONAME)
-	set_target_properties(git2 PROPERTIES VERSION ${libgit2_VERSION})
-	set_target_properties(git2 PROPERTIES SOVERSION "${libgit2_VERSION_MAJOR}.${libgit2_VERSION_MINOR}")
-	if(LIBGIT2_FILENAME)
-		target_compile_definitions(git2 PRIVATE LIBGIT2_FILENAME=\"${LIBGIT2_FILENAME}\")
-		set_target_properties(git2 PROPERTIES OUTPUT_NAME ${LIBGIT2_FILENAME})
-	elseif(DEFINED LIBGIT2_PREFIX)
-		set_target_properties(git2 PROPERTIES PREFIX "${LIBGIT2_PREFIX}")
-	endif()
-endif()
-
-pkg_build_config(NAME libgit2
-	VERSION ${libgit2_VERSION}
-	DESCRIPTION "The git library, take 2"
-	LIBS_SELF git2
-	PRIVATE_LIBS ${LIBGIT2_PC_LIBS}
-	REQUIRES ${LIBGIT2_PC_REQUIRES}
-)
-
-if(MSVC_IDE)
-	# Precompiled headers
-	set_target_properties(git2 PROPERTIES COMPILE_FLAGS "/Yuprecompiled.h /FIprecompiled.h")
-	set_source_files_properties(win32/precompiled.c COMPILE_FLAGS "/Ycprecompiled.h")
-endif()
-
-# Install
-install(TARGETS git2
-	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})
diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt
new file mode 100644
index 000000000..e6cdddd49
--- /dev/null
+++ b/src/libgit2/CMakeLists.txt
@@ -0,0 +1,305 @@
+add_library(git2internal OBJECT)
+set_target_properties(git2internal PROPERTIES C_STANDARD 90)
+set_target_properties(git2internal PROPERTIES C_EXTENSIONS OFF)
+
+
+if(DEPRECATE_HARD)
+        add_definitions(-DGIT_DEPRECATE_HARD)
+endif()
+
+if(DEBUG_POOL)
+	set(GIT_DEBUG_POOL 1)
+endif()
+add_feature_info(debugpool GIT_DEBUG_POOL "debug pool allocator")
+
+if(DEBUG_STRICT_ALLOC)
+	set(GIT_DEBUG_STRICT_ALLOC 1)
+endif()
+add_feature_info(debugalloc GIT_DEBUG_STRICT_ALLOC "debug strict allocators")
+
+if(DEBUG_STRICT_OPEN)
+	set(GIT_DEBUG_STRICT_OPEN 1)
+endif()
+add_feature_info(debugopen GIT_DEBUG_STRICT_OPEN "path validation in open")
+
+
+include(PkgBuildConfig)
+include(SanitizeBool)
+
+# This variable will contain the libraries we need to put into
+# libgit2.pc's Requires.private. That is, what we're linking to or
+# what someone who's statically linking us needs to link to.
+set(LIBGIT2_PC_REQUIRES "")
+# This will be set later if we use the system's http-parser library or
+# use iconv (OSX) and will be written to the Libs.private field in the
+# pc file.
+set(LIBGIT2_PC_LIBS "")
+
+set(LIBGIT2_INCLUDES
+	"${CMAKE_CURRENT_BINARY_DIR}"
+	"${PROJECT_SOURCE_DIR}/src/libgit2"
+	"${PROJECT_SOURCE_DIR}/include")
+
+if(HAVE_FUTIMENS)
+	set(GIT_USE_FUTIMENS 1)
+endif ()
+add_feature_info(futimens GIT_USE_FUTIMENS "futimens support")
+
+check_prototype_definition(qsort_r
+	"void qsort_r(void *base, size_t nmemb, size_t size, void *thunk, int (*compar)(void *, const void *, const void *))"
+	"" "stdlib.h" GIT_QSORT_R_BSD)
+
+check_prototype_definition(qsort_r
+	"void qsort_r(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *arg)"
+	"" "stdlib.h" GIT_QSORT_R_GNU)
+
+check_function_exists(qsort_s GIT_QSORT_S)
+
+# Find required dependencies
+
+if(WIN32)
+	list(APPEND LIBGIT2_SYSTEM_LIBS ws2_32)
+elseif(CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
+	list(APPEND LIBGIT2_SYSTEM_LIBS socket nsl)
+	list(APPEND LIBGIT2_PC_LIBS "-lsocket" "-lnsl")
+elseif(CMAKE_SYSTEM_NAME MATCHES "Haiku")
+	list(APPEND LIBGIT2_SYSTEM_LIBS network)
+	list(APPEND LIBGIT2_PC_LIBS "-lnetwork")
+endif()
+
+check_library_exists(rt clock_gettime "time.h" NEED_LIBRT)
+if(NEED_LIBRT)
+	list(APPEND LIBGIT2_SYSTEM_LIBS rt)
+	list(APPEND LIBGIT2_PC_LIBS "-lrt")
+endif()
+
+if(USE_THREADS)
+	list(APPEND LIBGIT2_SYSTEM_LIBS ${CMAKE_THREAD_LIBS_INIT})
+	list(APPEND LIBGIT2_PC_LIBS ${CMAKE_THREAD_LIBS_INIT})
+endif()
+add_feature_info(threadsafe USE_THREADS "threadsafe support")
+
+
+if(WIN32 AND EMBED_SSH_PATH)
+	file(GLOB SRC_SSH "${EMBED_SSH_PATH}/src/*.c")
+	list(SORT SRC_SSH)
+	target_sources(git2internal 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()
+
+include(SelectHTTPSBackend)
+include(SelectHashes)
+include(SelectHTTPParser)
+include(SelectRegex)
+include(SelectSSH)
+include(SelectWinHTTP)
+include(SelectZlib)
+
+
+if(USE_SHA1 STREQUAL "CollisionDetection")
+	file(GLOB SRC_SHA1 hash/sha1/collisiondetect.* hash/sha1/sha1dc/*)
+elseif(USE_SHA1 STREQUAL "OpenSSL")
+	file(GLOB SRC_SHA1 hash/sha1/openssl.*)
+elseif(USE_SHA1 STREQUAL "CommonCrypto")
+	file(GLOB SRC_SHA1 hash/sha1/common_crypto.*)
+elseif(USE_SHA1 STREQUAL "mbedTLS")
+	file(GLOB SRC_SHA1 hash/sha1/mbedtls.*)
+elseif(USE_SHA1 STREQUAL "Win32")
+	file(GLOB SRC_SHA1 hash/sha1/win32.*)
+elseif(USE_SHA1 STREQUAL "Generic")
+	file(GLOB SRC_SHA1 hash/sha1/generic.*)
+endif()
+list(APPEND SRC_SHA1 "hash/sha1.h")
+target_sources(git2internal PRIVATE ${SRC_SHA1})
+
+# Optional external dependency: ntlmclient
+if(USE_NTLMCLIENT)
+	set(GIT_NTLM 1)
+	add_subdirectory("${PROJECT_SOURCE_DIR}/deps/ntlmclient" "${PROJECT_BINARY_DIR}/deps/ntlmclient")
+	list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${PROJECT_SOURCE_DIR}/deps/ntlmclient")
+	list(APPEND LIBGIT2_DEPENDENCY_OBJECTS "$<TARGET_OBJECTS:ntlmclient>")
+endif()
+add_feature_info(ntlmclient GIT_NTLM "NTLM authentication support for Unix")
+
+# Optional external dependency: GSSAPI
+
+include(SelectGSSAPI)
+
+# Optional external dependency: iconv
+if(USE_ICONV)
+	find_package(Iconv)
+endif()
+if(ICONV_FOUND)
+	set(GIT_USE_ICONV 1)
+	list(APPEND LIBGIT2_SYSTEM_INCLUDES ${ICONV_INCLUDE_DIR})
+	list(APPEND LIBGIT2_SYSTEM_LIBS ${ICONV_LIBRARIES})
+	list(APPEND LIBGIT2_PC_LIBS ${ICONV_LIBRARIES})
+endif()
+add_feature_info(iconv GIT_USE_ICONV "iconv encoding conversion support")
+
+
+if(USE_THREADS)
+	if(NOT WIN32)
+		find_package(Threads REQUIRED)
+	endif()
+
+	set(GIT_THREADS 1)
+endif()
+
+if(USE_NSEC)
+	set(GIT_USE_NSEC 1)
+endif()
+
+if(HAVE_STRUCT_STAT_ST_MTIM)
+	set(GIT_USE_STAT_MTIM 1)
+elseif(HAVE_STRUCT_STAT_ST_MTIMESPEC)
+	set(GIT_USE_STAT_MTIMESPEC 1)
+elseif(HAVE_STRUCT_STAT_ST_MTIME_NSEC)
+	set(GIT_USE_STAT_MTIME_NSEC 1)
+endif()
+
+target_compile_definitions(git2internal PRIVATE _FILE_OFFSET_BITS=64)
+
+# Collect sourcefiles
+file(GLOB SRC_H
+	"${PROJECT_SOURCE_DIR}/include/git2.h"
+	"${PROJECT_SOURCE_DIR}/include/git2/*.h"
+	"${PROJECT_SOURCE_DIR}/include/git2/sys/*.h")
+list(SORT SRC_H)
+target_sources(git2internal PRIVATE ${SRC_H})
+
+# On Windows use specific platform sources
+if(WIN32 AND NOT CYGWIN)
+	set(WIN_RC "win32/git2.rc")
+
+	file(GLOB SRC_OS win32/*.c win32/*.h)
+	list(SORT SRC_OS)
+	target_sources(git2internal PRIVATE ${SRC_OS})
+elseif(AMIGA)
+	target_compile_definitions(git2internal PRIVATE NO_ADDRINFO NO_READDIR_R NO_MMAP)
+else()
+	file(GLOB SRC_OS unix/*.c unix/*.h)
+	list(SORT SRC_OS)
+	target_sources(git2internal PRIVATE ${SRC_OS})
+endif()
+
+if(USE_LEAK_CHECKER STREQUAL "valgrind")
+	target_compile_definitions(git2internal PRIVATE VALGRIND)
+endif()
+
+file(GLOB SRC_GIT2 *.c *.h
+	allocators/*.c allocators/*.h
+	streams/*.c streams/*.h
+	transports/*.c transports/*.h
+	xdiff/*.c xdiff/*.h)
+list(SORT SRC_GIT2)
+target_sources(git2internal PRIVATE ${SRC_GIT2})
+
+if(APPLE)
+	# The old Secure Transport API has been deprecated in macOS 10.15.
+	set_source_files_properties(streams/stransport.c PROPERTIES COMPILE_FLAGS -Wno-deprecated)
+endif()
+
+# the xdiff dependency is not (yet) warning-free, disable warnings as
+# errors for the xdiff sources until we've sorted them out
+ if(MSVC)
+	set_source_files_properties(xdiff/xdiffi.c PROPERTIES COMPILE_FLAGS -WX-)
+	set_source_files_properties(xdiff/xemit.c PROPERTIES COMPILE_FLAGS -WX-)
+	set_source_files_properties(xdiff/xhistogram.c PROPERTIES COMPILE_FLAGS -WX-)
+	set_source_files_properties(xdiff/xmerge.c PROPERTIES COMPILE_FLAGS -WX-)
+	set_source_files_properties(xdiff/xutils.c PROPERTIES COMPILE_FLAGS -WX-)
+	set_source_files_properties(xdiff/xpatience.c PROPERTIES COMPILE_FLAGS -WX-)
+else()
+	set_source_files_properties(xdiff/xdiffi.c PROPERTIES COMPILE_FLAGS "-Wno-sign-compare -Wno-unused-parameter")
+	set_source_files_properties(xdiff/xemit.c PROPERTIES COMPILE_FLAGS "-Wno-sign-compare -Wno-unused-parameter")
+	set_source_files_properties(xdiff/xhistogram.c PROPERTIES COMPILE_FLAGS "-Wno-sign-compare")
+	set_source_files_properties(xdiff/xutils.c PROPERTIES COMPILE_FLAGS "-Wno-sign-compare")
+	set_source_files_properties(xdiff/xpatience.c PROPERTIES COMPILE_FLAGS "-Wno-sign-compare")
+ endif()
+
+# Determine architecture of the machine
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+	set(GIT_ARCH_64 1)
+elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+	set(GIT_ARCH_32 1)
+elseif(CMAKE_SIZEOF_VOID_P)
+	message(FATAL_ERROR "Unsupported architecture (pointer size is ${CMAKE_SIZEOF_VOID_P} bytes)")
+else()
+	message(FATAL_ERROR "Unsupported architecture (CMAKE_SIZEOF_VOID_P is unset)")
+endif()
+
+configure_file(features.h.in git2/sys/features.h)
+
+ide_split_sources(git2internal)
+list(APPEND LIBGIT2_OBJECTS $<TARGET_OBJECTS:git2internal> ${LIBGIT2_DEPENDENCY_OBJECTS})
+
+target_include_directories(git2internal PRIVATE ${LIBGIT2_INCLUDES} ${LIBGIT2_DEPENDENCY_INCLUDES} PUBLIC ${PROJECT_SOURCE_DIR}/include)
+target_include_directories(git2internal SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES})
+
+set(LIBGIT2_INCLUDES ${LIBGIT2_INCLUDES} PARENT_SCOPE)
+set(LIBGIT2_OBJECTS ${LIBGIT2_OBJECTS} PARENT_SCOPE)
+set(LIBGIT2_DEPENDENCY_INCLUDES ${LIBGIT2_DEPENDENCY_INCLUDES} PARENT_SCOPE)
+set(LIBGIT2_DEPENDENCY_OBJECTS ${LIBGIT2_DEPENDENCY_OBJECTS} PARENT_SCOPE)
+set(LIBGIT2_SYSTEM_INCLUDES ${LIBGIT2_SYSTEM_INCLUDES} PARENT_SCOPE)
+set(LIBGIT2_SYSTEM_LIBS ${LIBGIT2_SYSTEM_LIBS} PARENT_SCOPE)
+
+if(XCODE_VERSION)
+	# This is required for Xcode to actually link the libgit2 library
+	# when using only object libraries.
+	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.c "")
+	list(APPEND LIBGIT2_OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/dummy.c)
+endif()
+
+# Compile and link libgit2
+add_library(git2 ${WIN_RC} ${LIBGIT2_OBJECTS})
+target_link_libraries(git2 ${LIBGIT2_SYSTEM_LIBS})
+
+set_target_properties(git2 PROPERTIES C_STANDARD 90)
+set_target_properties(git2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
+set_target_properties(git2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
+set_target_properties(git2 PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
+
+# Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240)
+# Win64+MSVC+static libs = linker error
+if(MSVC AND GIT_ARCH_64 AND NOT BUILD_SHARED_LIBS)
+	set_target_properties(git2 PROPERTIES STATIC_LIBRARY_FLAGS "/MACHINE:x64")
+endif()
+
+ide_split_sources(git2)
+
+if(SONAME)
+	set_target_properties(git2 PROPERTIES VERSION ${libgit2_VERSION})
+	set_target_properties(git2 PROPERTIES SOVERSION "${libgit2_VERSION_MAJOR}.${libgit2_VERSION_MINOR}")
+	if(LIBGIT2_FILENAME)
+		target_compile_definitions(git2 PRIVATE LIBGIT2_FILENAME=\"${LIBGIT2_FILENAME}\")
+		set_target_properties(git2 PROPERTIES OUTPUT_NAME ${LIBGIT2_FILENAME})
+	elseif(DEFINED LIBGIT2_PREFIX)
+		set_target_properties(git2 PROPERTIES PREFIX "${LIBGIT2_PREFIX}")
+	endif()
+endif()
+
+pkg_build_config(NAME libgit2
+	VERSION ${libgit2_VERSION}
+	DESCRIPTION "The git library, take 2"
+	LIBS_SELF git2
+	PRIVATE_LIBS ${LIBGIT2_PC_LIBS}
+	REQUIRES ${LIBGIT2_PC_REQUIRES}
+)
+
+if(MSVC_IDE)
+	# Precompiled headers
+	set_target_properties(git2 PROPERTIES COMPILE_FLAGS "/Yuprecompiled.h /FIprecompiled.h")
+	set_source_files_properties(win32/precompiled.c COMPILE_FLAGS "/Ycprecompiled.h")
+endif()
+
+# Install
+install(TARGETS git2
+	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})
diff --git a/src/alloc.c b/src/libgit2/alloc.c
index 2820d84a2..2820d84a2 100644
--- a/src/alloc.c
+++ b/src/libgit2/alloc.c
diff --git a/src/alloc.h b/src/libgit2/alloc.h
index 04fb7e101..04fb7e101 100644
--- a/src/alloc.h
+++ b/src/libgit2/alloc.h
diff --git a/src/allocators/failalloc.c b/src/libgit2/allocators/failalloc.c
index 5257d1dec..5257d1dec 100644
--- a/src/allocators/failalloc.c
+++ b/src/libgit2/allocators/failalloc.c
diff --git a/src/allocators/failalloc.h b/src/libgit2/allocators/failalloc.h
index 6115e51e7..6115e51e7 100644
--- a/src/allocators/failalloc.h
+++ b/src/libgit2/allocators/failalloc.h
diff --git a/src/allocators/stdalloc.c b/src/libgit2/allocators/stdalloc.c
index 2b36d9f3d..2b36d9f3d 100644
--- a/src/allocators/stdalloc.c
+++ b/src/libgit2/allocators/stdalloc.c
diff --git a/src/allocators/stdalloc.h b/src/libgit2/allocators/stdalloc.h
index fa23fe6e3..fa23fe6e3 100644
--- a/src/allocators/stdalloc.h
+++ b/src/libgit2/allocators/stdalloc.h
diff --git a/src/allocators/win32_leakcheck.c b/src/libgit2/allocators/win32_leakcheck.c
index fe06a14af..fe06a14af 100644
--- a/src/allocators/win32_leakcheck.c
+++ b/src/libgit2/allocators/win32_leakcheck.c
diff --git a/src/allocators/win32_leakcheck.h b/src/libgit2/allocators/win32_leakcheck.h
index 089690f90..089690f90 100644
--- a/src/allocators/win32_leakcheck.h
+++ b/src/libgit2/allocators/win32_leakcheck.h
diff --git a/src/annotated_commit.c b/src/libgit2/annotated_commit.c
index e48947679..e48947679 100644
--- a/src/annotated_commit.c
+++ b/src/libgit2/annotated_commit.c
diff --git a/src/annotated_commit.h b/src/libgit2/annotated_commit.h
index 444a2ed10..444a2ed10 100644
--- a/src/annotated_commit.h
+++ b/src/libgit2/annotated_commit.h
diff --git a/src/apply.c b/src/libgit2/apply.c
index 18304da4d..18304da4d 100644
--- a/src/apply.c
+++ b/src/libgit2/apply.c
diff --git a/src/apply.h b/src/libgit2/apply.h
index e990a7107..e990a7107 100644
--- a/src/apply.h
+++ b/src/libgit2/apply.h
diff --git a/src/array.h b/src/libgit2/array.h
index e97688b36..e97688b36 100644
--- a/src/array.h
+++ b/src/libgit2/array.h
diff --git a/src/assert_safe.h b/src/libgit2/assert_safe.h
index 8c261100f..8c261100f 100644
--- a/src/assert_safe.h
+++ b/src/libgit2/assert_safe.h
diff --git a/src/attr.c b/src/libgit2/attr.c
index 1623b1d45..1623b1d45 100644
--- a/src/attr.c
+++ b/src/libgit2/attr.c
diff --git a/src/attr.h b/src/libgit2/attr.h
index 977565205..977565205 100644
--- a/src/attr.h
+++ b/src/libgit2/attr.h
diff --git a/src/attr_file.c b/src/libgit2/attr_file.c
index 0eb881a9b..0eb881a9b 100644
--- a/src/attr_file.c
+++ b/src/libgit2/attr_file.c
diff --git a/src/attr_file.h b/src/libgit2/attr_file.h
index 08630d1a6..08630d1a6 100644
--- a/src/attr_file.h
+++ b/src/libgit2/attr_file.h
diff --git a/src/attrcache.c b/src/libgit2/attrcache.c
index b16d95c3c..b16d95c3c 100644
--- a/src/attrcache.c
+++ b/src/libgit2/attrcache.c
diff --git a/src/attrcache.h b/src/libgit2/attrcache.h
index b13e0e8f0..b13e0e8f0 100644
--- a/src/attrcache.h
+++ b/src/libgit2/attrcache.h
diff --git a/src/bitvec.h b/src/libgit2/bitvec.h
index 544832d95..544832d95 100644
--- a/src/bitvec.h
+++ b/src/libgit2/bitvec.h
diff --git a/src/blame.c b/src/libgit2/blame.c
index a6ab43efd..a6ab43efd 100644
--- a/src/blame.c
+++ b/src/libgit2/blame.c
diff --git a/src/blame.h b/src/libgit2/blame.h
index 4141e2bb5..4141e2bb5 100644
--- a/src/blame.h
+++ b/src/libgit2/blame.h
diff --git a/src/blame_git.c b/src/libgit2/blame_git.c
index 2504b338a..2504b338a 100644
--- a/src/blame_git.c
+++ b/src/libgit2/blame_git.c
diff --git a/src/blame_git.h b/src/libgit2/blame_git.h
index 48b85a20d..48b85a20d 100644
--- a/src/blame_git.h
+++ b/src/libgit2/blame_git.h
diff --git a/src/blob.c b/src/libgit2/blob.c
index 19ce8b3b5..19ce8b3b5 100644
--- a/src/blob.c
+++ b/src/libgit2/blob.c
diff --git a/src/blob.h b/src/libgit2/blob.h
index 9a5dda225..9a5dda225 100644
--- a/src/blob.h
+++ b/src/libgit2/blob.h
diff --git a/src/branch.c b/src/libgit2/branch.c
index 2e29af99d..2e29af99d 100644
--- a/src/branch.c
+++ b/src/libgit2/branch.c
diff --git a/src/branch.h b/src/libgit2/branch.h
index b4db42a01..b4db42a01 100644
--- a/src/branch.h
+++ b/src/libgit2/branch.h
diff --git a/src/buf.c b/src/libgit2/buf.c
index 652f5dd52..652f5dd52 100644
--- a/src/buf.c
+++ b/src/libgit2/buf.c
diff --git a/src/buf.h b/src/libgit2/buf.h
index 4bc7f2709..4bc7f2709 100644
--- a/src/buf.h
+++ b/src/libgit2/buf.h
diff --git a/src/cache.c b/src/libgit2/cache.c
index 2f68e357c..2f68e357c 100644
--- a/src/cache.c
+++ b/src/libgit2/cache.c
diff --git a/src/cache.h b/src/libgit2/cache.h
index 42c4fa80d..42c4fa80d 100644
--- a/src/cache.h
+++ b/src/libgit2/cache.h
diff --git a/src/cc-compat.h b/src/libgit2/cc-compat.h
index a0971e86c..a0971e86c 100644
--- a/src/cc-compat.h
+++ b/src/libgit2/cc-compat.h
diff --git a/src/checkout.c b/src/libgit2/checkout.c
index 6a4643196..6a4643196 100644
--- a/src/checkout.c
+++ b/src/libgit2/checkout.c
diff --git a/src/checkout.h b/src/libgit2/checkout.h
index 517fbf3b1..517fbf3b1 100644
--- a/src/checkout.h
+++ b/src/libgit2/checkout.h
diff --git a/src/cherrypick.c b/src/libgit2/cherrypick.c
index 9ec4962b9..9ec4962b9 100644
--- a/src/cherrypick.c
+++ b/src/libgit2/cherrypick.c
diff --git a/src/clone.c b/src/libgit2/clone.c
index 1843875f8..1843875f8 100644
--- a/src/clone.c
+++ b/src/libgit2/clone.c
diff --git a/src/clone.h b/src/libgit2/clone.h
index 7d73cabd5..7d73cabd5 100644
--- a/src/clone.h
+++ b/src/libgit2/clone.h
diff --git a/src/commit.c b/src/libgit2/commit.c
index b137463f3..b137463f3 100644
--- a/src/commit.c
+++ b/src/libgit2/commit.c
diff --git a/src/commit.h b/src/libgit2/commit.h
index 7a2454e61..7a2454e61 100644
--- a/src/commit.h
+++ b/src/libgit2/commit.h
diff --git a/src/commit_graph.c b/src/libgit2/commit_graph.c
index 70e866b92..70e866b92 100644
--- a/src/commit_graph.c
+++ b/src/libgit2/commit_graph.c
diff --git a/src/commit_graph.h b/src/libgit2/commit_graph.h
index 45e125b9e..45e125b9e 100644
--- a/src/commit_graph.h
+++ b/src/libgit2/commit_graph.h
diff --git a/src/commit_list.c b/src/libgit2/commit_list.c
index 4585508bc..4585508bc 100644
--- a/src/commit_list.c
+++ b/src/libgit2/commit_list.c
diff --git a/src/commit_list.h b/src/libgit2/commit_list.h
index aad39f351..aad39f351 100644
--- a/src/commit_list.h
+++ b/src/libgit2/commit_list.h
diff --git a/src/common.h b/src/libgit2/common.h
index 549bddb59..549bddb59 100644
--- a/src/common.h
+++ b/src/libgit2/common.h
diff --git a/src/config.c b/src/libgit2/config.c
index 88da34c5e..88da34c5e 100644
--- a/src/config.c
+++ b/src/libgit2/config.c
diff --git a/src/config.h b/src/libgit2/config.h
index 01b84b157..01b84b157 100644
--- a/src/config.h
+++ b/src/libgit2/config.h
diff --git a/src/config_backend.h b/src/libgit2/config_backend.h
index dbb190514..dbb190514 100644
--- a/src/config_backend.h
+++ b/src/libgit2/config_backend.h
diff --git a/src/config_cache.c b/src/libgit2/config_cache.c
index 4bb91f52b..4bb91f52b 100644
--- a/src/config_cache.c
+++ b/src/libgit2/config_cache.c
diff --git a/src/config_entries.c b/src/libgit2/config_entries.c
index 66aae096d..66aae096d 100644
--- a/src/config_entries.c
+++ b/src/libgit2/config_entries.c
diff --git a/src/config_entries.h b/src/libgit2/config_entries.h
index 832379e74..832379e74 100644
--- a/src/config_entries.h
+++ b/src/libgit2/config_entries.h
diff --git a/src/config_file.c b/src/libgit2/config_file.c
index 66fcb8ae2..66fcb8ae2 100644
--- a/src/config_file.c
+++ b/src/libgit2/config_file.c
diff --git a/src/config_mem.c b/src/libgit2/config_mem.c
index 560229cf5..560229cf5 100644
--- a/src/config_mem.c
+++ b/src/libgit2/config_mem.c
diff --git a/src/config_parse.c b/src/libgit2/config_parse.c
index 06931368e..06931368e 100644
--- a/src/config_parse.c
+++ b/src/libgit2/config_parse.c
diff --git a/src/config_parse.h b/src/libgit2/config_parse.h
index b791d3245..b791d3245 100644
--- a/src/config_parse.h
+++ b/src/libgit2/config_parse.h
diff --git a/src/config_snapshot.c b/src/libgit2/config_snapshot.c
index e295d2f7f..e295d2f7f 100644
--- a/src/config_snapshot.c
+++ b/src/libgit2/config_snapshot.c
diff --git a/src/crlf.c b/src/libgit2/crlf.c
index 1e1f1e845..1e1f1e845 100644
--- a/src/crlf.c
+++ b/src/libgit2/crlf.c
diff --git a/src/date.c b/src/libgit2/date.c
index 0e5ffc96b..0e5ffc96b 100644
--- a/src/date.c
+++ b/src/libgit2/date.c
diff --git a/src/date.h b/src/libgit2/date.h
index 7ebd3c30e..7ebd3c30e 100644
--- a/src/date.h
+++ b/src/libgit2/date.h
diff --git a/src/delta.c b/src/libgit2/delta.c
index 2d2c5fa85..2d2c5fa85 100644
--- a/src/delta.c
+++ b/src/libgit2/delta.c
diff --git a/src/delta.h b/src/libgit2/delta.h
index f61987304..f61987304 100644
--- a/src/delta.h
+++ b/src/libgit2/delta.h
diff --git a/src/describe.c b/src/libgit2/describe.c
index 1033eac50..1033eac50 100644
--- a/src/describe.c
+++ b/src/libgit2/describe.c
diff --git a/src/diff.c b/src/libgit2/diff.c
index 9840d6050..9840d6050 100644
--- a/src/diff.c
+++ b/src/libgit2/diff.c
diff --git a/src/diff.h b/src/libgit2/diff.h
index 2cc35e65b..2cc35e65b 100644
--- a/src/diff.h
+++ b/src/libgit2/diff.h
diff --git a/src/diff_driver.c b/src/libgit2/diff_driver.c
index 5f25fdb44..5f25fdb44 100644
--- a/src/diff_driver.c
+++ b/src/libgit2/diff_driver.c
diff --git a/src/diff_driver.h b/src/libgit2/diff_driver.h
index 03711e89e..03711e89e 100644
--- a/src/diff_driver.h
+++ b/src/libgit2/diff_driver.h
diff --git a/src/diff_file.c b/src/libgit2/diff_file.c
index c7e9fbeee..c7e9fbeee 100644
--- a/src/diff_file.c
+++ b/src/libgit2/diff_file.c
diff --git a/src/diff_file.h b/src/libgit2/diff_file.h
index 8d743e821..8d743e821 100644
--- a/src/diff_file.h
+++ b/src/libgit2/diff_file.h
diff --git a/src/diff_generate.c b/src/libgit2/diff_generate.c
index cfaefba66..cfaefba66 100644
--- a/src/diff_generate.c
+++ b/src/libgit2/diff_generate.c
diff --git a/src/diff_generate.h b/src/libgit2/diff_generate.h
index b782f29c6..b782f29c6 100644
--- a/src/diff_generate.h
+++ b/src/libgit2/diff_generate.h
diff --git a/src/diff_parse.c b/src/libgit2/diff_parse.c
index 75e41a544..75e41a544 100644
--- a/src/diff_parse.c
+++ b/src/libgit2/diff_parse.c
diff --git a/src/diff_parse.h b/src/libgit2/diff_parse.h
index 876782128..876782128 100644
--- a/src/diff_parse.h
+++ b/src/libgit2/diff_parse.h
diff --git a/src/diff_print.c b/src/libgit2/diff_print.c
index 03d25b087..03d25b087 100644
--- a/src/diff_print.c
+++ b/src/libgit2/diff_print.c
diff --git a/src/diff_stats.c b/src/libgit2/diff_stats.c
index 259939844..259939844 100644
--- a/src/diff_stats.c
+++ b/src/libgit2/diff_stats.c
diff --git a/src/diff_stats.h b/src/libgit2/diff_stats.h
index c71862b4e..c71862b4e 100644
--- a/src/diff_stats.h
+++ b/src/libgit2/diff_stats.h
diff --git a/src/diff_tform.c b/src/libgit2/diff_tform.c
index 913d649b0..913d649b0 100644
--- a/src/diff_tform.c
+++ b/src/libgit2/diff_tform.c
diff --git a/src/diff_tform.h b/src/libgit2/diff_tform.h
index 7abb8b3fe..7abb8b3fe 100644
--- a/src/diff_tform.h
+++ b/src/libgit2/diff_tform.h
diff --git a/src/diff_xdiff.c b/src/libgit2/diff_xdiff.c
index 3f6eccac1..3f6eccac1 100644
--- a/src/diff_xdiff.c
+++ b/src/libgit2/diff_xdiff.c
diff --git a/src/diff_xdiff.h b/src/libgit2/diff_xdiff.h
index 9b303e9dc..9b303e9dc 100644
--- a/src/diff_xdiff.h
+++ b/src/libgit2/diff_xdiff.h
diff --git a/src/email.c b/src/libgit2/email.c
index e19a2928c..e19a2928c 100644
--- a/src/email.c
+++ b/src/libgit2/email.c
diff --git a/src/email.h b/src/libgit2/email.h
index 083e56d5c..083e56d5c 100644
--- a/src/email.h
+++ b/src/libgit2/email.h
diff --git a/src/errors.c b/src/libgit2/errors.c
index 3614b9ce5..3614b9ce5 100644
--- a/src/errors.c
+++ b/src/libgit2/errors.c
diff --git a/src/errors.h b/src/libgit2/errors.h
index 772c7bad1..772c7bad1 100644
--- a/src/errors.h
+++ b/src/libgit2/errors.h
diff --git a/src/features.h.in b/src/libgit2/features.h.in
index f920135da..f920135da 100644
--- a/src/features.h.in
+++ b/src/libgit2/features.h.in
diff --git a/src/fetch.c b/src/libgit2/fetch.c
index 03d38452c..03d38452c 100644
--- a/src/fetch.c
+++ b/src/libgit2/fetch.c
diff --git a/src/fetch.h b/src/libgit2/fetch.h
index 10b6731f0..10b6731f0 100644
--- a/src/fetch.h
+++ b/src/libgit2/fetch.h
diff --git a/src/fetchhead.c b/src/libgit2/fetchhead.c
index 6511124ef..6511124ef 100644
--- a/src/fetchhead.c
+++ b/src/libgit2/fetchhead.c
diff --git a/src/fetchhead.h b/src/libgit2/fetchhead.h
index 9e5171010..9e5171010 100644
--- a/src/fetchhead.h
+++ b/src/libgit2/fetchhead.h
diff --git a/src/filebuf.c b/src/libgit2/filebuf.c
index eafcba3bd..eafcba3bd 100644
--- a/src/filebuf.c
+++ b/src/libgit2/filebuf.c
diff --git a/src/filebuf.h b/src/libgit2/filebuf.h
index adbb19936..adbb19936 100644
--- a/src/filebuf.h
+++ b/src/libgit2/filebuf.h
diff --git a/src/filter.c b/src/libgit2/filter.c
index 2712e8c60..2712e8c60 100644
--- a/src/filter.c
+++ b/src/libgit2/filter.c
diff --git a/src/filter.h b/src/libgit2/filter.h
index 58cb4b424..58cb4b424 100644
--- a/src/filter.h
+++ b/src/libgit2/filter.h
diff --git a/src/fs_path.c b/src/libgit2/fs_path.c
index 7a657778a..7a657778a 100644
--- a/src/fs_path.c
+++ b/src/libgit2/fs_path.c
diff --git a/src/fs_path.h b/src/libgit2/fs_path.h
index 222c44abc..222c44abc 100644
--- a/src/fs_path.h
+++ b/src/libgit2/fs_path.h
diff --git a/src/futils.c b/src/libgit2/futils.c
index 42c35955e..42c35955e 100644
--- a/src/futils.c
+++ b/src/libgit2/futils.c
diff --git a/src/futils.h b/src/libgit2/futils.h
index a82ec41cc..a82ec41cc 100644
--- a/src/futils.h
+++ b/src/libgit2/futils.h
diff --git a/src/graph.c b/src/libgit2/graph.c
index 35e914f74..35e914f74 100644
--- a/src/graph.c
+++ b/src/libgit2/graph.c
diff --git a/src/hash.c b/src/libgit2/hash.c
index 98ceb05d2..98ceb05d2 100644
--- a/src/hash.c
+++ b/src/libgit2/hash.c
diff --git a/src/hash.h b/src/libgit2/hash.h
index 507c1cb25..507c1cb25 100644
--- a/src/hash.h
+++ b/src/libgit2/hash.h
diff --git a/src/hash/sha1.h b/src/libgit2/hash/sha1.h
index 4b4dae3f8..4b4dae3f8 100644
--- a/src/hash/sha1.h
+++ b/src/libgit2/hash/sha1.h
diff --git a/src/hash/sha1/collisiondetect.c b/src/libgit2/hash/sha1/collisiondetect.c
index ec7059c4c..ec7059c4c 100644
--- a/src/hash/sha1/collisiondetect.c
+++ b/src/libgit2/hash/sha1/collisiondetect.c
diff --git a/src/hash/sha1/collisiondetect.h b/src/libgit2/hash/sha1/collisiondetect.h
index eb88e86c1..eb88e86c1 100644
--- a/src/hash/sha1/collisiondetect.h
+++ b/src/libgit2/hash/sha1/collisiondetect.h
diff --git a/src/hash/sha1/common_crypto.c b/src/libgit2/hash/sha1/common_crypto.c
index 9d608f449..9d608f449 100644
--- a/src/hash/sha1/common_crypto.c
+++ b/src/libgit2/hash/sha1/common_crypto.c
diff --git a/src/hash/sha1/common_crypto.h b/src/libgit2/hash/sha1/common_crypto.h
index a5fcfb33e..a5fcfb33e 100644
--- a/src/hash/sha1/common_crypto.h
+++ b/src/libgit2/hash/sha1/common_crypto.h
diff --git a/src/hash/sha1/generic.c b/src/libgit2/hash/sha1/generic.c
index 85b34c578..85b34c578 100644
--- a/src/hash/sha1/generic.c
+++ b/src/libgit2/hash/sha1/generic.c
diff --git a/src/hash/sha1/generic.h b/src/libgit2/hash/sha1/generic.h
index 53fc0823e..53fc0823e 100644
--- a/src/hash/sha1/generic.h
+++ b/src/libgit2/hash/sha1/generic.h
diff --git a/src/hash/sha1/mbedtls.c b/src/libgit2/hash/sha1/mbedtls.c
index 56016bec8..56016bec8 100644
--- a/src/hash/sha1/mbedtls.c
+++ b/src/libgit2/hash/sha1/mbedtls.c
diff --git a/src/hash/sha1/mbedtls.h b/src/libgit2/hash/sha1/mbedtls.h
index 15f7462a4..15f7462a4 100644
--- a/src/hash/sha1/mbedtls.h
+++ b/src/libgit2/hash/sha1/mbedtls.h
diff --git a/src/hash/sha1/openssl.c b/src/libgit2/hash/sha1/openssl.c
index 64bf99b3c..64bf99b3c 100644
--- a/src/hash/sha1/openssl.c
+++ b/src/libgit2/hash/sha1/openssl.c
diff --git a/src/hash/sha1/openssl.h b/src/libgit2/hash/sha1/openssl.h
index a223ca03e..a223ca03e 100644
--- a/src/hash/sha1/openssl.h
+++ b/src/libgit2/hash/sha1/openssl.h
diff --git a/src/hash/sha1/sha1dc/sha1.c b/src/libgit2/hash/sha1/sha1dc/sha1.c
index 929822728..929822728 100644
--- a/src/hash/sha1/sha1dc/sha1.c
+++ b/src/libgit2/hash/sha1/sha1dc/sha1.c
diff --git a/src/hash/sha1/sha1dc/sha1.h b/src/libgit2/hash/sha1/sha1dc/sha1.h
index 1e4e94be5..1e4e94be5 100644
--- a/src/hash/sha1/sha1dc/sha1.h
+++ b/src/libgit2/hash/sha1/sha1dc/sha1.h
diff --git a/src/hash/sha1/sha1dc/ubc_check.c b/src/libgit2/hash/sha1/sha1dc/ubc_check.c
index b3beff2af..b3beff2af 100644
--- a/src/hash/sha1/sha1dc/ubc_check.c
+++ b/src/libgit2/hash/sha1/sha1dc/ubc_check.c
diff --git a/src/hash/sha1/sha1dc/ubc_check.h b/src/libgit2/hash/sha1/sha1dc/ubc_check.h
index d7e17dc73..d7e17dc73 100644
--- a/src/hash/sha1/sha1dc/ubc_check.h
+++ b/src/libgit2/hash/sha1/sha1dc/ubc_check.h
diff --git a/src/hash/sha1/win32.c b/src/libgit2/hash/sha1/win32.c
index b89dfbad8..b89dfbad8 100644
--- a/src/hash/sha1/win32.c
+++ b/src/libgit2/hash/sha1/win32.c
diff --git a/src/hash/sha1/win32.h b/src/libgit2/hash/sha1/win32.h
index 791d20a42..791d20a42 100644
--- a/src/hash/sha1/win32.h
+++ b/src/libgit2/hash/sha1/win32.h
diff --git a/src/hashsig.c b/src/libgit2/hashsig.c
index 6b4fb8352..6b4fb8352 100644
--- a/src/hashsig.c
+++ b/src/libgit2/hashsig.c
diff --git a/src/ident.c b/src/libgit2/ident.c
index 53095864e..53095864e 100644
--- a/src/ident.c
+++ b/src/libgit2/ident.c
diff --git a/src/idxmap.c b/src/libgit2/idxmap.c
index bc23608f2..bc23608f2 100644
--- a/src/idxmap.c
+++ b/src/libgit2/idxmap.c
diff --git a/src/idxmap.h b/src/libgit2/idxmap.h
index 76170ef32..76170ef32 100644
--- a/src/idxmap.h
+++ b/src/libgit2/idxmap.h
diff --git a/src/ignore.c b/src/libgit2/ignore.c
index cee58d7f1..cee58d7f1 100644
--- a/src/ignore.c
+++ b/src/libgit2/ignore.c
diff --git a/src/ignore.h b/src/libgit2/ignore.h
index aa5ca62b7..aa5ca62b7 100644
--- a/src/ignore.h
+++ b/src/libgit2/ignore.h
diff --git a/src/index.c b/src/libgit2/index.c
index aa97c6421..aa97c6421 100644
--- a/src/index.c
+++ b/src/libgit2/index.c
diff --git a/src/index.h b/src/libgit2/index.h
index 71bb096f7..71bb096f7 100644
--- a/src/index.h
+++ b/src/libgit2/index.h
diff --git a/src/indexer.c b/src/libgit2/indexer.c
index f9a32e7ac..f9a32e7ac 100644
--- a/src/indexer.c
+++ b/src/libgit2/indexer.c
diff --git a/src/indexer.h b/src/libgit2/indexer.h
index 8ee6115a6..8ee6115a6 100644
--- a/src/indexer.h
+++ b/src/libgit2/indexer.h
diff --git a/src/integer.h b/src/libgit2/integer.h
index 63277177b..63277177b 100644
--- a/src/integer.h
+++ b/src/libgit2/integer.h
diff --git a/src/iterator.c b/src/libgit2/iterator.c
index 15bb63dc8..15bb63dc8 100644
--- a/src/iterator.c
+++ b/src/libgit2/iterator.c
diff --git a/src/iterator.h b/src/libgit2/iterator.h
index 6bb8489d0..6bb8489d0 100644
--- a/src/iterator.h
+++ b/src/libgit2/iterator.h
diff --git a/src/khash.h b/src/libgit2/khash.h
index c9b7f131f..c9b7f131f 100644
--- a/src/khash.h
+++ b/src/libgit2/khash.h
diff --git a/src/libgit2.c b/src/libgit2/libgit2.c
index efad3bf6d..efad3bf6d 100644
--- a/src/libgit2.c
+++ b/src/libgit2/libgit2.c
diff --git a/src/libgit2.h b/src/libgit2/libgit2.h
index a898367ae..a898367ae 100644
--- a/src/libgit2.h
+++ b/src/libgit2/libgit2.h
diff --git a/src/mailmap.c b/src/libgit2/mailmap.c
index 4336fe3e5..4336fe3e5 100644
--- a/src/mailmap.c
+++ b/src/libgit2/mailmap.c
diff --git a/src/mailmap.h b/src/libgit2/mailmap.h
index 2c9736a4a..2c9736a4a 100644
--- a/src/mailmap.h
+++ b/src/libgit2/mailmap.h
diff --git a/src/map.h b/src/libgit2/map.h
index 01931d199..01931d199 100644
--- a/src/map.h
+++ b/src/libgit2/map.h
diff --git a/src/merge.c b/src/libgit2/merge.c
index 641b32632..641b32632 100644
--- a/src/merge.c
+++ b/src/libgit2/merge.c
diff --git a/src/merge.h b/src/libgit2/merge.h
index 23932905e..23932905e 100644
--- a/src/merge.h
+++ b/src/libgit2/merge.h
diff --git a/src/merge_driver.c b/src/libgit2/merge_driver.c
index 19b35ac0e..19b35ac0e 100644
--- a/src/merge_driver.c
+++ b/src/libgit2/merge_driver.c
diff --git a/src/merge_driver.h b/src/libgit2/merge_driver.h
index 6b7da5287..6b7da5287 100644
--- a/src/merge_driver.h
+++ b/src/libgit2/merge_driver.h
diff --git a/src/merge_file.c b/src/libgit2/merge_file.c
index 732a047b1..732a047b1 100644
--- a/src/merge_file.c
+++ b/src/libgit2/merge_file.c
diff --git a/src/message.c b/src/libgit2/message.c
index ec0103a33..ec0103a33 100644
--- a/src/message.c
+++ b/src/libgit2/message.c
diff --git a/src/midx.c b/src/libgit2/midx.c
index eb99e7373..eb99e7373 100644
--- a/src/midx.c
+++ b/src/libgit2/midx.c
diff --git a/src/midx.h b/src/libgit2/midx.h
index 7dd851bd3..7dd851bd3 100644
--- a/src/midx.h
+++ b/src/libgit2/midx.h
diff --git a/src/mwindow.c b/src/libgit2/mwindow.c
index d06b7a80e..d06b7a80e 100644
--- a/src/mwindow.c
+++ b/src/libgit2/mwindow.c
diff --git a/src/mwindow.h b/src/libgit2/mwindow.h
index e3a03f019..e3a03f019 100644
--- a/src/mwindow.h
+++ b/src/libgit2/mwindow.h
diff --git a/src/net.c b/src/libgit2/net.c
index a76fd1d7c..a76fd1d7c 100644
--- a/src/net.c
+++ b/src/libgit2/net.c
diff --git a/src/net.h b/src/libgit2/net.h
index 499315e6c..499315e6c 100644
--- a/src/net.h
+++ b/src/libgit2/net.h
diff --git a/src/netops.c b/src/libgit2/netops.c
index 0a27365b8..0a27365b8 100644
--- a/src/netops.c
+++ b/src/libgit2/netops.c
diff --git a/src/netops.h b/src/libgit2/netops.h
index 56f968534..56f968534 100644
--- a/src/netops.h
+++ b/src/libgit2/netops.h
diff --git a/src/notes.c b/src/libgit2/notes.c
index d1a2b0f64..d1a2b0f64 100644
--- a/src/notes.c
+++ b/src/libgit2/notes.c
diff --git a/src/notes.h b/src/libgit2/notes.h
index 2168e4595..2168e4595 100644
--- a/src/notes.h
+++ b/src/libgit2/notes.h
diff --git a/src/object.c b/src/libgit2/object.c
index 7bc256fce..7bc256fce 100644
--- a/src/object.c
+++ b/src/libgit2/object.c
diff --git a/src/object.h b/src/libgit2/object.h
index 66be57557..66be57557 100644
--- a/src/object.h
+++ b/src/libgit2/object.h
diff --git a/src/object_api.c b/src/libgit2/object_api.c
index d45abd5ce..d45abd5ce 100644
--- a/src/object_api.c
+++ b/src/libgit2/object_api.c
diff --git a/src/odb.c b/src/libgit2/odb.c
index 6d714ba54..6d714ba54 100644
--- a/src/odb.c
+++ b/src/libgit2/odb.c
diff --git a/src/odb.h b/src/libgit2/odb.h
index 5aa4cc84a..5aa4cc84a 100644
--- a/src/odb.h
+++ b/src/libgit2/odb.h
diff --git a/src/odb_loose.c b/src/libgit2/odb_loose.c
index 463e24fa5..463e24fa5 100644
--- a/src/odb_loose.c
+++ b/src/libgit2/odb_loose.c
diff --git a/src/odb_mempack.c b/src/libgit2/odb_mempack.c
index 6f27f45f8..6f27f45f8 100644
--- a/src/odb_mempack.c
+++ b/src/libgit2/odb_mempack.c
diff --git a/src/odb_pack.c b/src/libgit2/odb_pack.c
index 818cc6125..818cc6125 100644
--- a/src/odb_pack.c
+++ b/src/libgit2/odb_pack.c
diff --git a/src/offmap.c b/src/libgit2/offmap.c
index be9eb66d8..be9eb66d8 100644
--- a/src/offmap.c
+++ b/src/libgit2/offmap.c
diff --git a/src/offmap.h b/src/libgit2/offmap.h
index 81c459b01..81c459b01 100644
--- a/src/offmap.h
+++ b/src/libgit2/offmap.h
diff --git a/src/oid.c b/src/libgit2/oid.c
index 19061e899..19061e899 100644
--- a/src/oid.c
+++ b/src/libgit2/oid.c
diff --git a/src/oid.h b/src/libgit2/oid.h
index 5baec33e5..5baec33e5 100644
--- a/src/oid.h
+++ b/src/libgit2/oid.h
diff --git a/src/oidarray.c b/src/libgit2/oidarray.c
index 583017c4e..583017c4e 100644
--- a/src/oidarray.c
+++ b/src/libgit2/oidarray.c
diff --git a/src/oidarray.h b/src/libgit2/oidarray.h
index eed3a1091..eed3a1091 100644
--- a/src/oidarray.h
+++ b/src/libgit2/oidarray.h
diff --git a/src/oidmap.c b/src/libgit2/oidmap.c
index 0ae8bf33e..0ae8bf33e 100644
--- a/src/oidmap.c
+++ b/src/libgit2/oidmap.c
diff --git a/src/oidmap.h b/src/libgit2/oidmap.h
index b748f727c..b748f727c 100644
--- a/src/oidmap.h
+++ b/src/libgit2/oidmap.h
diff --git a/src/pack-objects.c b/src/libgit2/pack-objects.c
index 1aa6731b3..1aa6731b3 100644
--- a/src/pack-objects.c
+++ b/src/libgit2/pack-objects.c
diff --git a/src/pack-objects.h b/src/libgit2/pack-objects.h
index 2faa3ec7f..2faa3ec7f 100644
--- a/src/pack-objects.h
+++ b/src/libgit2/pack-objects.h
diff --git a/src/pack.c b/src/libgit2/pack.c
index 5c0cba7e8..5c0cba7e8 100644
--- a/src/pack.c
+++ b/src/libgit2/pack.c
diff --git a/src/pack.h b/src/libgit2/pack.h
index bf279c6b6..bf279c6b6 100644
--- a/src/pack.h
+++ b/src/libgit2/pack.h
diff --git a/src/parse.c b/src/libgit2/parse.c
index 0a10758bf..0a10758bf 100644
--- a/src/parse.c
+++ b/src/libgit2/parse.c
diff --git a/src/parse.h b/src/libgit2/parse.h
index 0ecb7c103..0ecb7c103 100644
--- a/src/parse.h
+++ b/src/libgit2/parse.h
diff --git a/src/patch.c b/src/libgit2/patch.c
index a30546f3c..a30546f3c 100644
--- a/src/patch.c
+++ b/src/libgit2/patch.c
diff --git a/src/patch.h b/src/libgit2/patch.h
index 1e1471ed6..1e1471ed6 100644
--- a/src/patch.h
+++ b/src/libgit2/patch.h
diff --git a/src/patch_generate.c b/src/libgit2/patch_generate.c
index bc598fea8..bc598fea8 100644
--- a/src/patch_generate.c
+++ b/src/libgit2/patch_generate.c
diff --git a/src/patch_generate.h b/src/libgit2/patch_generate.h
index 56e3e9df4..56e3e9df4 100644
--- a/src/patch_generate.h
+++ b/src/libgit2/patch_generate.h
diff --git a/src/patch_parse.c b/src/libgit2/patch_parse.c
index 78cd96252..78cd96252 100644
--- a/src/patch_parse.c
+++ b/src/libgit2/patch_parse.c
diff --git a/src/patch_parse.h b/src/libgit2/patch_parse.h
index 140629da8..140629da8 100644
--- a/src/patch_parse.h
+++ b/src/libgit2/patch_parse.h
diff --git a/src/path.c b/src/libgit2/path.c
index 05a3dc2cf..05a3dc2cf 100644
--- a/src/path.c
+++ b/src/libgit2/path.c
diff --git a/src/path.h b/src/libgit2/path.h
index c4a2c4250..c4a2c4250 100644
--- a/src/path.h
+++ b/src/libgit2/path.h
diff --git a/src/pathspec.c b/src/libgit2/pathspec.c
index 3e44643c6..3e44643c6 100644
--- a/src/pathspec.c
+++ b/src/libgit2/pathspec.c
diff --git a/src/pathspec.h b/src/libgit2/pathspec.h
index 0256cb927..0256cb927 100644
--- a/src/pathspec.h
+++ b/src/libgit2/pathspec.h
diff --git a/src/pool.c b/src/libgit2/pool.c
index 16ffa398d..16ffa398d 100644
--- a/src/pool.c
+++ b/src/libgit2/pool.c
diff --git a/src/pool.h b/src/libgit2/pool.h
index cecb84665..cecb84665 100644
--- a/src/pool.h
+++ b/src/libgit2/pool.h
diff --git a/src/posix.c b/src/libgit2/posix.c
index b1f85dc94..b1f85dc94 100644
--- a/src/posix.c
+++ b/src/libgit2/posix.c
diff --git a/src/posix.h b/src/libgit2/posix.h
index e6f603078..e6f603078 100644
--- a/src/posix.h
+++ b/src/libgit2/posix.h
diff --git a/src/pqueue.c b/src/libgit2/pqueue.c
index 3820e999c..3820e999c 100644
--- a/src/pqueue.c
+++ b/src/libgit2/pqueue.c
diff --git a/src/pqueue.h b/src/libgit2/pqueue.h
index 4db74ea03..4db74ea03 100644
--- a/src/pqueue.h
+++ b/src/libgit2/pqueue.h
diff --git a/src/proxy.c b/src/libgit2/proxy.c
index ef91ad6ea..ef91ad6ea 100644
--- a/src/proxy.c
+++ b/src/libgit2/proxy.c
diff --git a/src/proxy.h b/src/libgit2/proxy.h
index 7c0ab598d..7c0ab598d 100644
--- a/src/proxy.h
+++ b/src/libgit2/proxy.h
diff --git a/src/push.c b/src/libgit2/push.c
index da8aebadd..da8aebadd 100644
--- a/src/push.c
+++ b/src/libgit2/push.c
diff --git a/src/push.h b/src/libgit2/push.h
index fc72e845e..fc72e845e 100644
--- a/src/push.h
+++ b/src/libgit2/push.h
diff --git a/src/reader.c b/src/libgit2/reader.c
index ba9775240..ba9775240 100644
--- a/src/reader.c
+++ b/src/libgit2/reader.c
diff --git a/src/reader.h b/src/libgit2/reader.h
index b58dc93f6..b58dc93f6 100644
--- a/src/reader.h
+++ b/src/libgit2/reader.h
diff --git a/src/rebase.c b/src/libgit2/rebase.c
index 6f01d3990..6f01d3990 100644
--- a/src/rebase.c
+++ b/src/libgit2/rebase.c
diff --git a/src/refdb.c b/src/libgit2/refdb.c
index ed33de92b..ed33de92b 100644
--- a/src/refdb.c
+++ b/src/libgit2/refdb.c
diff --git a/src/refdb.h b/src/libgit2/refdb.h
index 84e19b1c3..84e19b1c3 100644
--- a/src/refdb.h
+++ b/src/libgit2/refdb.h
diff --git a/src/refdb_fs.c b/src/libgit2/refdb_fs.c
index 95bda9404..95bda9404 100644
--- a/src/refdb_fs.c
+++ b/src/libgit2/refdb_fs.c
diff --git a/src/reflog.c b/src/libgit2/reflog.c
index 1e9c0d4f1..1e9c0d4f1 100644
--- a/src/reflog.c
+++ b/src/libgit2/reflog.c
diff --git a/src/reflog.h b/src/libgit2/reflog.h
index 8c3895952..8c3895952 100644
--- a/src/reflog.h
+++ b/src/libgit2/reflog.h
diff --git a/src/refs.c b/src/libgit2/refs.c
index 5c875b95b..5c875b95b 100644
--- a/src/refs.c
+++ b/src/libgit2/refs.c
diff --git a/src/refs.h b/src/libgit2/refs.h
index cb888bf8f..cb888bf8f 100644
--- a/src/refs.h
+++ b/src/libgit2/refs.h
diff --git a/src/refspec.c b/src/libgit2/refspec.c
index f0a0c2bfb..f0a0c2bfb 100644
--- a/src/refspec.c
+++ b/src/libgit2/refspec.c
diff --git a/src/refspec.h b/src/libgit2/refspec.h
index bf4f7fcfb..bf4f7fcfb 100644
--- a/src/refspec.h
+++ b/src/libgit2/refspec.h
diff --git a/src/regexp.c b/src/libgit2/regexp.c
index 2569dea0a..2569dea0a 100644
--- a/src/regexp.c
+++ b/src/libgit2/regexp.c
diff --git a/src/regexp.h b/src/libgit2/regexp.h
index 2592ef383..2592ef383 100644
--- a/src/regexp.h
+++ b/src/libgit2/regexp.h
diff --git a/src/remote.c b/src/libgit2/remote.c
index f6421b9eb..f6421b9eb 100644
--- a/src/remote.c
+++ b/src/libgit2/remote.c
diff --git a/src/remote.h b/src/libgit2/remote.h
index ea9c7d17f..ea9c7d17f 100644
--- a/src/remote.h
+++ b/src/libgit2/remote.h
diff --git a/src/repo_template.h b/src/libgit2/repo_template.h
index 099279aa7..099279aa7 100644
--- a/src/repo_template.h
+++ b/src/libgit2/repo_template.h
diff --git a/src/repository.c b/src/libgit2/repository.c
index 80b4a98eb..80b4a98eb 100644
--- a/src/repository.c
+++ b/src/libgit2/repository.c
diff --git a/src/repository.h b/src/libgit2/repository.h
index 3c3aa1e8e..3c3aa1e8e 100644
--- a/src/repository.h
+++ b/src/libgit2/repository.h
diff --git a/src/reset.c b/src/libgit2/reset.c
index e0d942e5e..e0d942e5e 100644
--- a/src/reset.c
+++ b/src/libgit2/reset.c
diff --git a/src/revert.c b/src/libgit2/revert.c
index d6ab6ae3c..d6ab6ae3c 100644
--- a/src/revert.c
+++ b/src/libgit2/revert.c
diff --git a/src/revparse.c b/src/libgit2/revparse.c
index 9bc28e9fc..9bc28e9fc 100644
--- a/src/revparse.c
+++ b/src/libgit2/revparse.c
diff --git a/src/revwalk.c b/src/libgit2/revwalk.c
index 553e0497a..553e0497a 100644
--- a/src/revwalk.c
+++ b/src/libgit2/revwalk.c
diff --git a/src/revwalk.h b/src/libgit2/revwalk.h
index 94b8a6fb1..94b8a6fb1 100644
--- a/src/revwalk.h
+++ b/src/libgit2/revwalk.h
diff --git a/src/runtime.c b/src/libgit2/runtime.c
index c05dee8b9..c05dee8b9 100644
--- a/src/runtime.c
+++ b/src/libgit2/runtime.c
diff --git a/src/runtime.h b/src/libgit2/runtime.h
index 24ac58ee9..24ac58ee9 100644
--- a/src/runtime.h
+++ b/src/libgit2/runtime.h
diff --git a/src/settings.h b/src/libgit2/settings.h
index dc42ce939..dc42ce939 100644
--- a/src/settings.h
+++ b/src/libgit2/settings.h
diff --git a/src/signature.c b/src/libgit2/signature.c
index 5d6ab572c..5d6ab572c 100644
--- a/src/signature.c
+++ b/src/libgit2/signature.c
diff --git a/src/signature.h b/src/libgit2/signature.h
index 5c8270954..5c8270954 100644
--- a/src/signature.h
+++ b/src/libgit2/signature.h
diff --git a/src/sortedcache.c b/src/libgit2/sortedcache.c
index 7ff900efe..7ff900efe 100644
--- a/src/sortedcache.c
+++ b/src/libgit2/sortedcache.c
diff --git a/src/sortedcache.h b/src/libgit2/sortedcache.h
index ef260a093..ef260a093 100644
--- a/src/sortedcache.h
+++ b/src/libgit2/sortedcache.h
diff --git a/src/stash.c b/src/libgit2/stash.c
index 5fc01ac36..5fc01ac36 100644
--- a/src/stash.c
+++ b/src/libgit2/stash.c
diff --git a/src/status.c b/src/libgit2/status.c
index df0f74507..df0f74507 100644
--- a/src/status.c
+++ b/src/libgit2/status.c
diff --git a/src/status.h b/src/libgit2/status.h
index 907479a22..907479a22 100644
--- a/src/status.h
+++ b/src/libgit2/status.h
diff --git a/src/str.c b/src/libgit2/str.c
index 0d405bfda..0d405bfda 100644
--- a/src/str.c
+++ b/src/libgit2/str.c
diff --git a/src/str.h b/src/libgit2/str.h
index ef769ce2f..ef769ce2f 100644
--- a/src/str.h
+++ b/src/libgit2/str.h
diff --git a/src/strarray.c b/src/libgit2/strarray.c
index 2f9b77cc2..2f9b77cc2 100644
--- a/src/strarray.c
+++ b/src/libgit2/strarray.c
diff --git a/src/stream.h b/src/libgit2/stream.h
index f16b026fb..f16b026fb 100644
--- a/src/stream.h
+++ b/src/libgit2/stream.h
diff --git a/src/streams/mbedtls.c b/src/libgit2/streams/mbedtls.c
index 0cf5c8af1..0cf5c8af1 100644
--- a/src/streams/mbedtls.c
+++ b/src/libgit2/streams/mbedtls.c
diff --git a/src/streams/mbedtls.h b/src/libgit2/streams/mbedtls.h
index bcca6dd40..bcca6dd40 100644
--- a/src/streams/mbedtls.h
+++ b/src/libgit2/streams/mbedtls.h
diff --git a/src/streams/openssl.c b/src/libgit2/streams/openssl.c
index 89c96780c..89c96780c 100644
--- a/src/streams/openssl.c
+++ b/src/libgit2/streams/openssl.c
diff --git a/src/streams/openssl.h b/src/libgit2/streams/openssl.h
index 89fb60a82..89fb60a82 100644
--- a/src/streams/openssl.h
+++ b/src/libgit2/streams/openssl.h
diff --git a/src/streams/openssl_dynamic.c b/src/libgit2/streams/openssl_dynamic.c
index da16b6ed7..da16b6ed7 100644
--- a/src/streams/openssl_dynamic.c
+++ b/src/libgit2/streams/openssl_dynamic.c
diff --git a/src/streams/openssl_dynamic.h b/src/libgit2/streams/openssl_dynamic.h
index a99691910..a99691910 100644
--- a/src/streams/openssl_dynamic.h
+++ b/src/libgit2/streams/openssl_dynamic.h
diff --git a/src/streams/openssl_legacy.c b/src/libgit2/streams/openssl_legacy.c
index e61e6efbb..e61e6efbb 100644
--- a/src/streams/openssl_legacy.c
+++ b/src/libgit2/streams/openssl_legacy.c
diff --git a/src/streams/openssl_legacy.h b/src/libgit2/streams/openssl_legacy.h
index e6dae9572..e6dae9572 100644
--- a/src/streams/openssl_legacy.h
+++ b/src/libgit2/streams/openssl_legacy.h
diff --git a/src/streams/registry.c b/src/libgit2/streams/registry.c
index e60e1cd63..e60e1cd63 100644
--- a/src/streams/registry.c
+++ b/src/libgit2/streams/registry.c
diff --git a/src/streams/registry.h b/src/libgit2/streams/registry.h
index adc2b8bdf..adc2b8bdf 100644
--- a/src/streams/registry.h
+++ b/src/libgit2/streams/registry.h
diff --git a/src/streams/socket.c b/src/libgit2/streams/socket.c
index 9415fe892..9415fe892 100644
--- a/src/streams/socket.c
+++ b/src/libgit2/streams/socket.c
diff --git a/src/streams/socket.h b/src/libgit2/streams/socket.h
index 3235f3167..3235f3167 100644
--- a/src/streams/socket.h
+++ b/src/libgit2/streams/socket.h
diff --git a/src/streams/stransport.c b/src/libgit2/streams/stransport.c
index 3f31d2541..3f31d2541 100644
--- a/src/streams/stransport.c
+++ b/src/libgit2/streams/stransport.c
diff --git a/src/streams/stransport.h b/src/libgit2/streams/stransport.h
index 1026e204b..1026e204b 100644
--- a/src/streams/stransport.h
+++ b/src/libgit2/streams/stransport.h
diff --git a/src/streams/tls.c b/src/libgit2/streams/tls.c
index e063a33f9..e063a33f9 100644
--- a/src/streams/tls.c
+++ b/src/libgit2/streams/tls.c
diff --git a/src/streams/tls.h b/src/libgit2/streams/tls.h
index 465a6ea89..465a6ea89 100644
--- a/src/streams/tls.h
+++ b/src/libgit2/streams/tls.h
diff --git a/src/strmap.c b/src/libgit2/strmap.c
index c6e5b6dc7..c6e5b6dc7 100644
--- a/src/strmap.c
+++ b/src/libgit2/strmap.c
diff --git a/src/strmap.h b/src/libgit2/strmap.h
index 9f5e4cc8b..9f5e4cc8b 100644
--- a/src/strmap.h
+++ b/src/libgit2/strmap.h
diff --git a/src/strnlen.h b/src/libgit2/strnlen.h
index eecfe3c02..eecfe3c02 100644
--- a/src/strnlen.h
+++ b/src/libgit2/strnlen.h
diff --git a/src/submodule.c b/src/libgit2/submodule.c
index 0f4f0726c..0f4f0726c 100644
--- a/src/submodule.c
+++ b/src/libgit2/submodule.c
diff --git a/src/submodule.h b/src/libgit2/submodule.h
index 7fa982486..7fa982486 100644
--- a/src/submodule.h
+++ b/src/libgit2/submodule.h
diff --git a/src/sysdir.c b/src/libgit2/sysdir.c
index 450cb509b..450cb509b 100644
--- a/src/sysdir.c
+++ b/src/libgit2/sysdir.c
diff --git a/src/sysdir.h b/src/libgit2/sysdir.h
index 568f27940..568f27940 100644
--- a/src/sysdir.h
+++ b/src/libgit2/sysdir.h
diff --git a/src/tag.c b/src/libgit2/tag.c
index 5734106fa..5734106fa 100644
--- a/src/tag.c
+++ b/src/libgit2/tag.c
diff --git a/src/tag.h b/src/libgit2/tag.h
index 76ae1508e..76ae1508e 100644
--- a/src/tag.h
+++ b/src/libgit2/tag.h
diff --git a/src/thread.c b/src/libgit2/thread.c
index 3171771d7..3171771d7 100644
--- a/src/thread.c
+++ b/src/libgit2/thread.c
diff --git a/src/thread.h b/src/libgit2/thread.h
index 4bbac9fd8..4bbac9fd8 100644
--- a/src/thread.h
+++ b/src/libgit2/thread.h
diff --git a/src/threadstate.c b/src/libgit2/threadstate.c
index 9e3ef5818..9e3ef5818 100644
--- a/src/threadstate.c
+++ b/src/libgit2/threadstate.c
diff --git a/src/threadstate.h b/src/libgit2/threadstate.h
index c10f26b59..c10f26b59 100644
--- a/src/threadstate.h
+++ b/src/libgit2/threadstate.h
diff --git a/src/trace.c b/src/libgit2/trace.c
index b0c56c4dc..b0c56c4dc 100644
--- a/src/trace.c
+++ b/src/libgit2/trace.c
diff --git a/src/trace.h b/src/libgit2/trace.h
index 239928dcb..239928dcb 100644
--- a/src/trace.h
+++ b/src/libgit2/trace.h
diff --git a/src/trailer.c b/src/libgit2/trailer.c
index 4761c9922..4761c9922 100644
--- a/src/trailer.c
+++ b/src/libgit2/trailer.c
diff --git a/src/transaction.c b/src/libgit2/transaction.c
index ccffa9984..ccffa9984 100644
--- a/src/transaction.c
+++ b/src/libgit2/transaction.c
diff --git a/src/transaction.h b/src/libgit2/transaction.h
index 780c06830..780c06830 100644
--- a/src/transaction.h
+++ b/src/libgit2/transaction.h
diff --git a/src/transport.c b/src/libgit2/transport.c
index 640ccacae..640ccacae 100644
--- a/src/transport.c
+++ b/src/libgit2/transport.c
diff --git a/src/transports/auth.c b/src/libgit2/transports/auth.c
index 90b6b124f..90b6b124f 100644
--- a/src/transports/auth.c
+++ b/src/libgit2/transports/auth.c
diff --git a/src/transports/auth.h b/src/libgit2/transports/auth.h
index 64680cc53..64680cc53 100644
--- a/src/transports/auth.h
+++ b/src/libgit2/transports/auth.h
diff --git a/src/transports/auth_negotiate.c b/src/libgit2/transports/auth_negotiate.c
index 6380504be..6380504be 100644
--- a/src/transports/auth_negotiate.c
+++ b/src/libgit2/transports/auth_negotiate.c
diff --git a/src/transports/auth_negotiate.h b/src/libgit2/transports/auth_negotiate.h
index 34aff295b..34aff295b 100644
--- a/src/transports/auth_negotiate.h
+++ b/src/libgit2/transports/auth_negotiate.h
diff --git a/src/transports/auth_ntlm.c b/src/libgit2/transports/auth_ntlm.c
index f49ce101a..f49ce101a 100644
--- a/src/transports/auth_ntlm.c
+++ b/src/libgit2/transports/auth_ntlm.c
diff --git a/src/transports/auth_ntlm.h b/src/libgit2/transports/auth_ntlm.h
index 40689498c..40689498c 100644
--- a/src/transports/auth_ntlm.h
+++ b/src/libgit2/transports/auth_ntlm.h
diff --git a/src/transports/credential.c b/src/libgit2/transports/credential.c
index 6e00b0282..6e00b0282 100644
--- a/src/transports/credential.c
+++ b/src/libgit2/transports/credential.c
diff --git a/src/transports/credential_helpers.c b/src/libgit2/transports/credential_helpers.c
index 6d34a4e97..6d34a4e97 100644
--- a/src/transports/credential_helpers.c
+++ b/src/libgit2/transports/credential_helpers.c
diff --git a/src/transports/git.c b/src/libgit2/transports/git.c
index 591e2ab03..591e2ab03 100644
--- a/src/transports/git.c
+++ b/src/libgit2/transports/git.c
diff --git a/src/transports/http.c b/src/libgit2/transports/http.c
index 7db5582ca..7db5582ca 100644
--- a/src/transports/http.c
+++ b/src/libgit2/transports/http.c
diff --git a/src/transports/http.h b/src/libgit2/transports/http.h
index 8e8e7226e..8e8e7226e 100644
--- a/src/transports/http.h
+++ b/src/libgit2/transports/http.h
diff --git a/src/transports/httpclient.c b/src/libgit2/transports/httpclient.c
index 75782da82..75782da82 100644
--- a/src/transports/httpclient.c
+++ b/src/libgit2/transports/httpclient.c
diff --git a/src/transports/httpclient.h b/src/libgit2/transports/httpclient.h
index 6d0ef9edb..6d0ef9edb 100644
--- a/src/transports/httpclient.h
+++ b/src/libgit2/transports/httpclient.h
diff --git a/src/transports/local.c b/src/libgit2/transports/local.c
index 6c754a034..6c754a034 100644
--- a/src/transports/local.c
+++ b/src/libgit2/transports/local.c
diff --git a/src/transports/smart.c b/src/libgit2/transports/smart.c
index 801fcbe53..801fcbe53 100644
--- a/src/transports/smart.c
+++ b/src/libgit2/transports/smart.c
diff --git a/src/transports/smart.h b/src/libgit2/transports/smart.h
index 9323d6c44..9323d6c44 100644
--- a/src/transports/smart.h
+++ b/src/libgit2/transports/smart.h
diff --git a/src/transports/smart_pkt.c b/src/libgit2/transports/smart_pkt.c
index b42edd0d6..b42edd0d6 100644
--- a/src/transports/smart_pkt.c
+++ b/src/libgit2/transports/smart_pkt.c
diff --git a/src/transports/smart_protocol.c b/src/libgit2/transports/smart_protocol.c
index 8cf027133..8cf027133 100644
--- a/src/transports/smart_protocol.c
+++ b/src/libgit2/transports/smart_protocol.c
diff --git a/src/transports/ssh.c b/src/libgit2/transports/ssh.c
index 89f085230..89f085230 100644
--- a/src/transports/ssh.c
+++ b/src/libgit2/transports/ssh.c
diff --git a/src/transports/ssh.h b/src/libgit2/transports/ssh.h
index d3e741f1d..d3e741f1d 100644
--- a/src/transports/ssh.h
+++ b/src/libgit2/transports/ssh.h
diff --git a/src/transports/winhttp.c b/src/libgit2/transports/winhttp.c
index 8ec5b37c5..8ec5b37c5 100644
--- a/src/transports/winhttp.c
+++ b/src/libgit2/transports/winhttp.c
diff --git a/src/tree-cache.c b/src/libgit2/tree-cache.c
index 0977c92f3..0977c92f3 100644
--- a/src/tree-cache.c
+++ b/src/libgit2/tree-cache.c
diff --git a/src/tree-cache.h b/src/libgit2/tree-cache.h
index a27e30466..a27e30466 100644
--- a/src/tree-cache.h
+++ b/src/libgit2/tree-cache.h
diff --git a/src/tree.c b/src/libgit2/tree.c
index a1545dc2d..a1545dc2d 100644
--- a/src/tree.c
+++ b/src/libgit2/tree.c
diff --git a/src/tree.h b/src/libgit2/tree.h
index 6bd9ed652..6bd9ed652 100644
--- a/src/tree.h
+++ b/src/libgit2/tree.h
diff --git a/src/tsort.c b/src/libgit2/tsort.c
index 045efad23..045efad23 100644
--- a/src/tsort.c
+++ b/src/libgit2/tsort.c
diff --git a/src/unix/map.c b/src/libgit2/unix/map.c
index 23fcb786e..23fcb786e 100644
--- a/src/unix/map.c
+++ b/src/libgit2/unix/map.c
diff --git a/src/unix/posix.h b/src/libgit2/unix/posix.h
index 49065e533..49065e533 100644
--- a/src/unix/posix.h
+++ b/src/libgit2/unix/posix.h
diff --git a/src/unix/pthread.h b/src/libgit2/unix/pthread.h
index 55f4ae227..55f4ae227 100644
--- a/src/unix/pthread.h
+++ b/src/libgit2/unix/pthread.h
diff --git a/src/unix/realpath.c b/src/libgit2/unix/realpath.c
index f1ca669f7..f1ca669f7 100644
--- a/src/unix/realpath.c
+++ b/src/libgit2/unix/realpath.c
diff --git a/src/userdiff.h b/src/libgit2/userdiff.h
index c9a80d712..c9a80d712 100644
--- a/src/userdiff.h
+++ b/src/libgit2/userdiff.h
diff --git a/src/utf8.c b/src/libgit2/utf8.c
index 77065cb71..77065cb71 100644
--- a/src/utf8.c
+++ b/src/libgit2/utf8.c
diff --git a/src/utf8.h b/src/libgit2/utf8.h
index dff91b294..dff91b294 100644
--- a/src/utf8.h
+++ b/src/libgit2/utf8.h
diff --git a/src/util.c b/src/libgit2/util.c
index e06d4ca09..e06d4ca09 100644
--- a/src/util.c
+++ b/src/libgit2/util.c
diff --git a/src/util.h b/src/libgit2/util.h
index 141779ade..141779ade 100644
--- a/src/util.h
+++ b/src/libgit2/util.h
diff --git a/src/libgit2/util/platform.h.in b/src/libgit2/util/platform.h.in
new file mode 100644
index 000000000..e511fe331
--- /dev/null
+++ b/src/libgit2/util/platform.h.in
@@ -0,0 +1,34 @@
+#ifndef INCLUDE_platform_h__
+#define INCLUDE_platform_h__
+
+#cmakedefine GIT_DEBUG_POOL 1
+#cmakedefine GIT_DEBUG_STRICT_ALLOC 1
+#cmakedefine GIT_DEBUG_STRICT_OPEN 1
+
+#cmakedefine GIT_WIN32_LEAKCHECK 1
+
+#cmakedefine GIT_ARCH_64 1
+#cmakedefine GIT_ARCH_32 1
+
+#cmakedefine GIT_USE_STAT_MTIM 1
+#cmakedefine GIT_USE_STAT_MTIMESPEC 1
+#cmakedefine GIT_USE_STAT_MTIME_NSEC 1
+#cmakedefine GIT_USE_FUTIMENS 1
+
+#cmakedefine GIT_USE_QSORT_R_BSD 1
+#cmakedefine GIT_USE_QSORT_R_GNU 1
+#cmakedefine GIT_USE_QSORT_S 1
+
+#cmakedefine GIT_REGEX_REGCOMP_L 1
+#cmakedefine GIT_REGEX_REGCOMP 1
+#cmakedefine GIT_REGEX_PCRE 1
+#cmakedefine GIT_REGEX_PCRE2 1
+#cmakedefine GIT_REGEX_BUILTIN 1
+
+#cmakedefine GIT_SHA1_COLLISIONDETECT 1
+#cmakedefine GIT_SHA1_WIN32 1
+#cmakedefine GIT_SHA1_COMMON_CRYPTO 1
+#cmakedefine GIT_SHA1_OPENSSL 1
+#cmakedefine GIT_SHA1_MBEDTLS 1
+
+#endif
diff --git a/src/varint.c b/src/libgit2/varint.c
index 9ffc1d744..9ffc1d744 100644
--- a/src/varint.c
+++ b/src/libgit2/varint.c
diff --git a/src/varint.h b/src/libgit2/varint.h
index 652e22486..652e22486 100644
--- a/src/varint.h
+++ b/src/libgit2/varint.h
diff --git a/src/vector.c b/src/libgit2/vector.c
index 4a4bc8c0e..4a4bc8c0e 100644
--- a/src/vector.c
+++ b/src/libgit2/vector.c
diff --git a/src/vector.h b/src/libgit2/vector.h
index ae3c79a4c..ae3c79a4c 100644
--- a/src/vector.h
+++ b/src/libgit2/vector.h
diff --git a/src/wildmatch.c b/src/libgit2/wildmatch.c
index a894e4841..a894e4841 100644
--- a/src/wildmatch.c
+++ b/src/libgit2/wildmatch.c
diff --git a/src/wildmatch.h b/src/libgit2/wildmatch.h
index 44bb575a6..44bb575a6 100644
--- a/src/wildmatch.h
+++ b/src/libgit2/wildmatch.h
diff --git a/src/win32/dir.c b/src/libgit2/win32/dir.c
index 44052caf0..44052caf0 100644
--- a/src/win32/dir.c
+++ b/src/libgit2/win32/dir.c
diff --git a/src/win32/dir.h b/src/libgit2/win32/dir.h
index acd64729e..acd64729e 100644
--- a/src/win32/dir.h
+++ b/src/libgit2/win32/dir.h
diff --git a/src/win32/error.c b/src/libgit2/win32/error.c
index 3a52fb5a9..3a52fb5a9 100644
--- a/src/win32/error.c
+++ b/src/libgit2/win32/error.c
diff --git a/src/win32/error.h b/src/libgit2/win32/error.h
index 9e81141ce..9e81141ce 100644
--- a/src/win32/error.h
+++ b/src/libgit2/win32/error.h
diff --git a/src/win32/findfile.c b/src/libgit2/win32/findfile.c
index 725a90167..725a90167 100644
--- a/src/win32/findfile.c
+++ b/src/libgit2/win32/findfile.c
diff --git a/src/win32/findfile.h b/src/libgit2/win32/findfile.h
index 61fb7dbad..61fb7dbad 100644
--- a/src/win32/findfile.h
+++ b/src/libgit2/win32/findfile.h
diff --git a/src/win32/git2.rc b/src/libgit2/win32/git2.rc
index d273afd70..3f97239da 100644
--- a/src/win32/git2.rc
+++ b/src/libgit2/win32/git2.rc
@@ -1,5 +1,5 @@
 #include <winver.h>
-#include "../../include/git2/version.h"
+#include "../../../include/git2/version.h"
 
 #ifndef LIBGIT2_FILENAME
 # ifdef __GNUC__
diff --git a/src/win32/map.c b/src/libgit2/win32/map.c
index 2aabc9b15..2aabc9b15 100644
--- a/src/win32/map.c
+++ b/src/libgit2/win32/map.c
diff --git a/src/win32/mingw-compat.h b/src/libgit2/win32/mingw-compat.h
index aa2bef98d..aa2bef98d 100644
--- a/src/win32/mingw-compat.h
+++ b/src/libgit2/win32/mingw-compat.h
diff --git a/src/win32/msvc-compat.h b/src/libgit2/win32/msvc-compat.h
index 03f9f36dc..03f9f36dc 100644
--- a/src/win32/msvc-compat.h
+++ b/src/libgit2/win32/msvc-compat.h
diff --git a/src/win32/path_w32.c b/src/libgit2/win32/path_w32.c
index d9fc8292b..d9fc8292b 100644
--- a/src/win32/path_w32.c
+++ b/src/libgit2/win32/path_w32.c
diff --git a/src/win32/path_w32.h b/src/libgit2/win32/path_w32.h
index 837b11ebd..837b11ebd 100644
--- a/src/win32/path_w32.h
+++ b/src/libgit2/win32/path_w32.h
diff --git a/src/win32/posix.h b/src/libgit2/win32/posix.h
index 578347f15..578347f15 100644
--- a/src/win32/posix.h
+++ b/src/libgit2/win32/posix.h
diff --git a/src/win32/posix_w32.c b/src/libgit2/win32/posix_w32.c
index 5f7cd0c26..5f7cd0c26 100644
--- a/src/win32/posix_w32.c
+++ b/src/libgit2/win32/posix_w32.c
diff --git a/src/win32/precompiled.c b/src/libgit2/win32/precompiled.c
index 5f656a45d..5f656a45d 100644
--- a/src/win32/precompiled.c
+++ b/src/libgit2/win32/precompiled.c
diff --git a/src/win32/precompiled.h b/src/libgit2/win32/precompiled.h
index 806b1698a..806b1698a 100644
--- a/src/win32/precompiled.h
+++ b/src/libgit2/win32/precompiled.h
diff --git a/src/win32/reparse.h b/src/libgit2/win32/reparse.h
index 23312319f..23312319f 100644
--- a/src/win32/reparse.h
+++ b/src/libgit2/win32/reparse.h
diff --git a/src/win32/thread.c b/src/libgit2/win32/thread.c
index f5cacd320..f5cacd320 100644
--- a/src/win32/thread.c
+++ b/src/libgit2/win32/thread.c
diff --git a/src/win32/thread.h b/src/libgit2/win32/thread.h
index 8305036b4..8305036b4 100644
--- a/src/win32/thread.h
+++ b/src/libgit2/win32/thread.h
diff --git a/src/win32/utf-conv.c b/src/libgit2/win32/utf-conv.c
index 4bde3023a..4bde3023a 100644
--- a/src/win32/utf-conv.c
+++ b/src/libgit2/win32/utf-conv.c
diff --git a/src/win32/utf-conv.h b/src/libgit2/win32/utf-conv.h
index 6090a4b35..6090a4b35 100644
--- a/src/win32/utf-conv.h
+++ b/src/libgit2/win32/utf-conv.h
diff --git a/src/win32/version.h b/src/libgit2/win32/version.h
index 79667697f..79667697f 100644
--- a/src/win32/version.h
+++ b/src/libgit2/win32/version.h
diff --git a/src/win32/w32_buffer.c b/src/libgit2/win32/w32_buffer.c
index 6fee8203c..6fee8203c 100644
--- a/src/win32/w32_buffer.c
+++ b/src/libgit2/win32/w32_buffer.c
diff --git a/src/win32/w32_buffer.h b/src/libgit2/win32/w32_buffer.h
index 4227296d8..4227296d8 100644
--- a/src/win32/w32_buffer.h
+++ b/src/libgit2/win32/w32_buffer.h
diff --git a/src/win32/w32_common.h b/src/libgit2/win32/w32_common.h
index c20b3e85e..c20b3e85e 100644
--- a/src/win32/w32_common.h
+++ b/src/libgit2/win32/w32_common.h
diff --git a/src/win32/w32_leakcheck.c b/src/libgit2/win32/w32_leakcheck.c
index 0f095de12..0f095de12 100644
--- a/src/win32/w32_leakcheck.c
+++ b/src/libgit2/win32/w32_leakcheck.c
diff --git a/src/win32/w32_leakcheck.h b/src/libgit2/win32/w32_leakcheck.h
index cb45e3675..cb45e3675 100644
--- a/src/win32/w32_leakcheck.h
+++ b/src/libgit2/win32/w32_leakcheck.h
diff --git a/src/win32/w32_util.c b/src/libgit2/win32/w32_util.c
index fe4b75bae..fe4b75bae 100644
--- a/src/win32/w32_util.c
+++ b/src/libgit2/win32/w32_util.c
diff --git a/src/win32/w32_util.h b/src/libgit2/win32/w32_util.h
index 1321d30e6..1321d30e6 100644
--- a/src/win32/w32_util.h
+++ b/src/libgit2/win32/w32_util.h
diff --git a/src/win32/win32-compat.h b/src/libgit2/win32/win32-compat.h
index dee40a438..dee40a438 100644
--- a/src/win32/win32-compat.h
+++ b/src/libgit2/win32/win32-compat.h
diff --git a/src/worktree.c b/src/libgit2/worktree.c
index 2ac2274f1..2ac2274f1 100644
--- a/src/worktree.c
+++ b/src/libgit2/worktree.c
diff --git a/src/worktree.h b/src/libgit2/worktree.h
index 587189f81..587189f81 100644
--- a/src/worktree.h
+++ b/src/libgit2/worktree.h
diff --git a/src/xdiff/git-xdiff.h b/src/libgit2/xdiff/git-xdiff.h
index b75dba819..b75dba819 100644
--- a/src/xdiff/git-xdiff.h
+++ b/src/libgit2/xdiff/git-xdiff.h
diff --git a/src/xdiff/xdiff.h b/src/libgit2/xdiff/xdiff.h
index fb47f63fb..fb47f63fb 100644
--- a/src/xdiff/xdiff.h
+++ b/src/libgit2/xdiff/xdiff.h
diff --git a/src/xdiff/xdiffi.c b/src/libgit2/xdiff/xdiffi.c
index af31b7f4b..af31b7f4b 100644
--- a/src/xdiff/xdiffi.c
+++ b/src/libgit2/xdiff/xdiffi.c
diff --git a/src/xdiff/xdiffi.h b/src/libgit2/xdiff/xdiffi.h
index 8f1c7c8b0..8f1c7c8b0 100644
--- a/src/xdiff/xdiffi.h
+++ b/src/libgit2/xdiff/xdiffi.h
diff --git a/src/xdiff/xemit.c b/src/libgit2/xdiff/xemit.c
index 1cbf2b982..1cbf2b982 100644
--- a/src/xdiff/xemit.c
+++ b/src/libgit2/xdiff/xemit.c
diff --git a/src/xdiff/xemit.h b/src/libgit2/xdiff/xemit.h
index 1b9887e67..1b9887e67 100644
--- a/src/xdiff/xemit.h
+++ b/src/libgit2/xdiff/xemit.h
diff --git a/src/xdiff/xhistogram.c b/src/libgit2/xdiff/xhistogram.c
index 80794748b..80794748b 100644
--- a/src/xdiff/xhistogram.c
+++ b/src/libgit2/xdiff/xhistogram.c
diff --git a/src/xdiff/xinclude.h b/src/libgit2/xdiff/xinclude.h
index 75db1d8f3..75db1d8f3 100644
--- a/src/xdiff/xinclude.h
+++ b/src/libgit2/xdiff/xinclude.h
diff --git a/src/xdiff/xmacros.h b/src/libgit2/xdiff/xmacros.h
index 2809a28ca..2809a28ca 100644
--- a/src/xdiff/xmacros.h
+++ b/src/libgit2/xdiff/xmacros.h
diff --git a/src/xdiff/xmerge.c b/src/libgit2/xdiff/xmerge.c
index 433e2d741..433e2d741 100644
--- a/src/xdiff/xmerge.c
+++ b/src/libgit2/xdiff/xmerge.c
diff --git a/src/xdiff/xpatience.c b/src/libgit2/xdiff/xpatience.c
index c5d48e80a..c5d48e80a 100644
--- a/src/xdiff/xpatience.c
+++ b/src/libgit2/xdiff/xpatience.c
diff --git a/src/xdiff/xprepare.c b/src/libgit2/xdiff/xprepare.c
index 4527a4a07..4527a4a07 100644
--- a/src/xdiff/xprepare.c
+++ b/src/libgit2/xdiff/xprepare.c
diff --git a/src/xdiff/xprepare.h b/src/libgit2/xdiff/xprepare.h
index 947d9fc1b..947d9fc1b 100644
--- a/src/xdiff/xprepare.h
+++ b/src/libgit2/xdiff/xprepare.h
diff --git a/src/xdiff/xtypes.h b/src/libgit2/xdiff/xtypes.h
index 8442bd436..8442bd436 100644
--- a/src/xdiff/xtypes.h
+++ b/src/libgit2/xdiff/xtypes.h
diff --git a/src/xdiff/xutils.c b/src/libgit2/xdiff/xutils.c
index cfa6e2220..cfa6e2220 100644
--- a/src/xdiff/xutils.c
+++ b/src/libgit2/xdiff/xutils.c
diff --git a/src/xdiff/xutils.h b/src/libgit2/xdiff/xutils.h
index fba7bae03..fba7bae03 100644
--- a/src/xdiff/xutils.h
+++ b/src/libgit2/xdiff/xutils.h
diff --git a/src/zstream.c b/src/libgit2/zstream.c
index cb8b125ed..cb8b125ed 100644
--- a/src/zstream.c
+++ b/src/libgit2/zstream.c
diff --git a/src/zstream.h b/src/libgit2/zstream.h
index 3f8b1c72f..3f8b1c72f 100644
--- a/src/zstream.h
+++ b/src/libgit2/zstream.h