svn commit: r1764235 - in /subversion/branches/ra-git/subversion/libsvn_fs_git: git-revroot.c svn_git.c

[rhuijben]

Author: rhuijben
Date: Tue Oct 11 13:30:48 2016
New Revision: 1764235

URL: http://svn.apache.org/viewvc?rev=1764235&view=rev
Log:
On the ra-git branch: Fix compilation of libsvn_fs_git by fixing one
minor libsvn_fs change and a libgit2 error handling change.

* subversion/libsvn_fs_git/git-revroot.c
  (root_vtable): Pass NULL as the new in 1.10 change iterator to fall
    back to the default implementation.
    
* subversion/libsvn_fs_git/svn_git.c
  (svn_git__wrap_git_error): Update for changed error handling in libgit2.

Modified:
    subversion/branches/ra-git/subversion/libsvn_fs_git/git-revroot.c
    subversion/branches/ra-git/subversion/libsvn_fs_git/svn_git.c

Modified: subversion/branches/ra-git/subversion/libsvn_fs_git/git-revroot.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_fs_git/git-revroot.c?rev=1764235&r1=1764234&r2=1764235&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/libsvn_fs_git/git-revroot.c (original)
+++ subversion/branches/ra-git/subversion/libsvn_fs_git/git-revroot.c Tue Oct 
11 13:30:48 2016
@@ -1374,6 +1374,7 @@ fs_git_get_mergeinfo(svn_mergeinfo_catal
 static const root_vtable_t root_vtable =
 {
   fs_git_paths_changed,
+  NULL,
   fs_git_check_path,
   fs_git_node_history,
   fs_git_node_id,

Modified: subversion/branches/ra-git/subversion/libsvn_fs_git/svn_git.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/libsvn_fs_git/svn_git.c?rev=1764235&r1=1764234&r2=1764235&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/libsvn_fs_git/svn_git.c (original)
+++ subversion/branches/ra-git/subversion/libsvn_fs_git/svn_git.c Tue Oct 11 
13:30:48 2016
@@ -309,12 +309,14 @@ svn_git__treebuilder_new(git_treebuilder
 svn_error_t *
 svn_git__wrap_git_error(void)
 {
-  git_error git_err;
+  svn_error_t *err = SVN_NO_ERROR;
+  const git_error *git_err = giterr_last();
 
-  if (giterr_detach(&git_err) == -1)
-    SVN_ERR_MALFUNCTION();
+  if (!git_err)
+       SVN_ERR_MALFUNCTION();
 
-  /* ### TODO: map error code */
-  return svn_error_createf(SVN_ERR_FS_GIT_LIBGIT2_ERROR, NULL,
-                           _("git: %s"), git_err.message);
+  err = svn_error_createf(SVN_ERR_FS_GIT_LIBGIT2_ERROR, NULL,
+                           _("git: %s"), git_err->message);
+  giterr_clear();
+  return svn_error_trace(err);
 }