Upgrade libgit2 to v0.25.0

tkelman · vtjnash · commit b23543fc7fef · 2017-02-07T12:11:06.000-05:00
rebase patches fixes #19793 (cherry picked from commit 99b5d34, but dropping libgit2-mbedtls patch: see PR #18658)
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.1
-LIBGIT2_SHA1=211e117a0590583a720c53172406f34186c543bd
+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-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`