You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2018/11/08 10:27:21 UTC

svn commit: r1846117 - in /subversion/branches/ra-git: BRANCH-README subversion/libsvn_ra_git/fetch.c

Author: brane
Date: Thu Nov  8 10:27:21 2018
New Revision: 1846117

URL: http://svn.apache.org/viewvc?rev=1846117&view=rev
Log:
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.

Modified:
    subversion/branches/ra-git/BRANCH-README
    subversion/branches/ra-git/subversion/libsvn_ra_git/fetch.c

Modified: subversion/branches/ra-git/BRANCH-README
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/BRANCH-README?rev=1846117&r1=1846116&r2=1846117&view=diff
==============================================================================
--- subversion/branches/ra-git/BRANCH-README (original)
+++ subversion/branches/ra-git/BRANCH-README Thu Nov  8 10:27:21 2018
@@ -13,7 +13,7 @@ Git repository are accessed via the foll
   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 

Modified: subversion/branches/ra-git/subversion/libsvn_ra_git/fetch.c
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_ra_git/fetch.c?rev=1846117&r1=1846116&r2=1846117&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/libsvn_ra_git/fetch.c (original)
+++ subversion/branches/ra-git/subversion/libsvn_ra_git/fetch.c Thu Nov  8 10:27:21 2018
@@ -143,7 +143,8 @@ svn_ra_git__split_url(const char **repos
 
       /* ... 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;