commit 769069430a7115d2a97c2cec40a8171430055a0e
author Branko Čibej <brane@apache.org> Thu Nov 08 10:27:21 2018 +0000
committer Branko Čibej <brane@apache.org> Thu Nov 08 10:27:21 2018 +0000
tree 8dbef0b6f2c950d61286ba42158166dfb0ecac0a
parent 2fe170af6aaf65547ba7860b73cc719d0e290e01

On the ra-git branch: Make the build work with a newer libgit2.

* BRANCH-README: Update working libgit2 version to 0.27.x.
* subversion/libsvn_ra_git/fetch.c
  (svn_ra_git__split_url): Update call to git_remote_connect.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/ra-git@1846117 13f79535-47bb-0310-9956-ffa450edef68

BRANCH-README

diff --git a/BRANCH-README b/BRANCH-README
index 42ce974..b729f09 100644
--- a/BRANCH-README
+++ b/BRANCH-README
@@ -13,7 +13,7 @@
   git+https://    git protocol via https
 
 All git operations are performed with libgit2. This code works with
-libgit2 v0.22.x. See http://libgit2.github.com/
+libgit2 v0.27.x. See http://libgit2.github.com/
 
 A bare git repository is stored in .svn/git. The svn working copy
 acts like the git working tree. For commands which don't use a 

subversion/libsvn_ra_git/fetch.c

diff --git a/subversion/libsvn_ra_git/fetch.c b/subversion/libsvn_ra_git/fetch.c
index 38d3e78..52b1b1a 100644
--- a/subversion/libsvn_ra_git/fetch.c
+++ b/subversion/libsvn_ra_git/fetch.c
@@ -143,7 +143,8 @@
 
       /* ... and try to connect to it. */
       git_err = git_remote_connect(remote, GIT_DIRECTION_FETCH, callbacks,
-		                           NULL /* custom_headers */);
+                                   NULL /* proxy_opts */,
+                                   NULL /* custom_headers */);
       if (!git_err)
         {
           found_remote = TRUE;