Upgrade libgit2 to v0.25.0

tkelman · tkelman · commit 99b5d34ec5a3 · 2017-01-04T10:05:41.000-05:00
rebase patches fixes #19793
diff --git a/deps/checksums/libgit2-428e18f8d4765b8ad6cf4022080a81ab16f6fdc4.tar.gz/md5 b/deps/checksums/libgit2-428e18f8d4765b8ad6cf4022080a81ab16f6fdc4.tar.gz/md5
diff --git a/deps/checksums/libgit2-428e18f8d4765b8ad6cf4022080a81ab16f6fdc4.tar.gz/sha512 b/deps/checksums/libgit2-428e18f8d4765b8ad6cf4022080a81ab16f6fdc4.tar.gz/sha512
diff --git a/deps/checksums/libgit2-75db289a041b1f1084768244e167b953ac7eeaa5.tar.gz/md5 b/deps/checksums/libgit2-75db289a041b1f1084768244e167b953ac7eeaa5.tar.gz/md5
@@ -0,0 +1 @@
+43f28f86c884c3c469ce4080de287ee7
diff --git a/deps/checksums/libgit2-75db289a041b1f1084768244e167b953ac7eeaa5.tar.gz/sha512 b/deps/checksums/libgit2-75db289a041b1f1084768244e167b953ac7eeaa5.tar.gz/sha512
@@ -0,0 +1 @@
+6d7c5a6fd0f6678944e0ae379f5b5fa628f7a6936db6fbff4442e98db7037fd3baf2010ffc7c45ed7a30c7ebff1973a0a9047d67dbac1dedf2df444a80bdf43b
diff --git a/deps/libgit2.version b/deps/libgit2.version
@@ -1,2 +1,2 @@
-LIBGIT2_BRANCH=v0.24.5
-LIBGIT2_SHA1=428e18f8d4765b8ad6cf4022080a81ab16f6fdc4
+LIBGIT2_BRANCH=v0.25.0
+LIBGIT2_SHA1=75db289a041b1f1084768244e167b953ac7eeaa5
diff --git a/deps/patches/libgit2-agent-nonfatal.patch b/deps/patches/libgit2-agent-nonfatal.patch
@@ -16,6 +16,7 @@ index cfd5736..82d2c63 100644
 +	if (rc != LIBSSH2_ERROR_NONE) {
 +		rc = LIBSSH2_ERROR_AUTHENTICATION_FAILED;
  		goto shutdown;
-+        }
++	}
  
  	rc = libssh2_agent_list_identities(agent);
+ 
diff --git a/deps/patches/libgit2-mbedtls.patch b/deps/patches/libgit2-mbedtls.patch
@@ -1,9 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0f9cff5..a345636 100644
+index 4e1104f..8110489 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -112,6 +112,10 @@ IF (HAVE_STRUCT_STAT_NSEC OR WIN32)
- 	OPTION( USE_NSEC		"Care about sub-second file mtimes and ctimes"	OFF )
+@@ -113,6 +113,10 @@ IF (HAVE_STRUCT_STAT_NSEC OR WIN32)
+ 	OPTION( USE_NSEC		"Care about sub-second file mtimes and ctimes"	ON  )
  ENDIF()
  
 +IF (NOT USE_OPENSSL)
@@ -126,13 +126,13 @@ index 0000000..2f4adbc
 +    MBEDCRYPTO_LIBRARY
 +)
 diff --git a/src/global.c b/src/global.c
-index 198bc1e..969b9b9 100644
+index e2ad8fe..c5b4269 100644
 --- a/src/global.c
 +++ b/src/global.c
-@@ -9,7 +9,11 @@
- #include "hash.h"
+@@ -10,7 +10,11 @@
  #include "sysdir.h"
  #include "filter.h"
+ #include "merge_driver.h"
 +#ifdef GIT_OPENSSL
  #include "openssl_stream.h"
 +#elif GIT_MBEDTLS
@@ -141,10 +141,10 @@ index 198bc1e..969b9b9 100644
  #include "thread-utils.h"
  #include "git2/global.h"
  #include "transports/ssh.h"
-@@ -59,8 +63,13 @@ static int init_common(void)
- 	if ((ret = git_hash_global_init()) == 0 &&
+@@ -61,8 +65,13 @@ static int init_common(void)
  		(ret = git_sysdir_global_init()) == 0 &&
  		(ret = git_filter_global_init()) == 0 &&
+ 		(ret = git_merge_driver_global_init()) == 0 &&
 -		(ret = git_transport_ssh_global_init()) == 0 &&
 -		(ret = git_openssl_stream_global_init()) == 0)
 +		(ret = git_transport_ssh_global_init()) == 0
@@ -850,32 +850,6 @@ index 83e2d06..6fb538f 100644
  #else
  	GIT_UNUSED(out);
  	GIT_UNUSED(host);
-diff --git a/src/transport.c b/src/transport.c
-index 327052f..a438459 100644
---- a/src/transport.c
-+++ b/src/transport.c
-@@ -29,7 +29,7 @@ static transport_definition local_transport_definition = { "file://", git_transp
- static transport_definition transports[] = {
- 	{ "git://",   git_transport_smart, &git_subtransport_definition },
- 	{ "http://",  git_transport_smart, &http_subtransport_definition },
--#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
-+#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT) || defined(GIT_MBEDTLS)
- 	{ "https://", git_transport_smart, &http_subtransport_definition },
- #endif
- 	{ "file://",  git_transport_local, NULL },
-diff --git a/src/transports/http.c b/src/transports/http.c
-index f0efd95..5cd7484 100644
---- a/src/transports/http.c
-+++ b/src/transports/http.c
-@@ -598,7 +598,7 @@ static int http_connect(http_subtransport *t)
- 
- 	error = git_stream_connect(t->io);
- 
--#if defined(GIT_OPENSSL) || defined(GIT_SECURE_TRANSPORT) || defined(GIT_CURL)
-+#if defined(GIT_OPENSSL) || defined(GIT_SECURE_TRANSPORT) || defined(GIT_CURL) || defined(GIT_MBEDTLS)
- 	if ((!error || error == GIT_ECERTIFICATE) && t->owner->certificate_check_cb != NULL &&
- 	    git_stream_is_encrypted(t->io)) {
- 		git_cert *cert;
 diff --git a/tests/core/stream.c b/tests/core/stream.c
 index 0cbf442..a4fa2b4 100644
 --- a/tests/core/stream.c
diff --git a/deps/patches/libgit2-ssh.patch b/deps/patches/libgit2-ssh.patch
@@ -9,7 +9,7 @@
 +	GET_TARGET_PROPERTY(LIBSSH2_INCLUDE_DIRS Libssh2::libssh2 INTERFACE_INCLUDE_DIRECTORIES)
 +	GET_TARGET_PROPERTY(LIBSSH2_LOCATION Libssh2::libssh2 IMPORTED_LOCATION_RELEASE)
 +	GET_FILENAME_COMPONENT(LIBSSH2_LIBRARY_DIRS ${LIBSSH2_LOCATION} PATH)
-+ 	SET(LIBSSH2_LIBRARIES "-lssh2")
++	SET(LIBSSH2_LIBRARIES "-lssh2")
  ENDIF()
 -IF (LIBSSH2_FOUND)
 +IF (Libssh2_FOUND)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+6d7c5a6fd0f6678944e0ae379f5b5fa628f7a6936db6fbff4442e98db7037fd3baf2010ffc7c45ed7a30c7ebff1973a0a9047d67dbac1dedf2df444a80bdf43b`