subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1717652 - /subversion/branches/ra-git/subversion/libsvn_fs_git/git-revroot.c
Date Wed, 02 Dec 2015 15:46:02 GMT
Author: rhuijben
Date: Wed Dec  2 15:46:02 2015
New Revision: 1717652

URL: http://svn.apache.org/viewvc?rev=1717652&view=rev
Log:
On the ra-git branch: remove some unneeded changed paths that were reported
in case a revision didn't have actual changes.

* subversion/libsvn_fs_git/git-revroot.c
  (fs_git_paths_changed): Only provide changes from the actual revision, not
    from the vision we are showing this branch of.
  (fs_git_dir_entries): Resolve shadowed variable warning.

Modified:
    subversion/branches/ra-git/subversion/libsvn_fs_git/git-revroot.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=1717652&r1=1717651&r2=1717652&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 Wed Dec  2 15:46:02
2015
@@ -489,6 +489,7 @@ fs_git_paths_changed(apr_hash_t **change
   const git_commit *commit, *parent_commit;
   git_tree *tree, *parent_tree;
   const git_oid *parent_oid;
+  svn_boolean_t found;
 
   *changed_paths_p = changed_paths;
 
@@ -514,11 +515,11 @@ fs_git_paths_changed(apr_hash_t **change
 
   /* TODO: Add branch + tag changes */
 
-  SVN_ERR(svn_fs_git__db_fetch_oid(NULL, &cmt_oid, &branch_path,
+  SVN_ERR(svn_fs_git__db_fetch_oid(&found, &cmt_oid, &branch_path,
                                    root->fs, root->rev,
                                    pool, pool));
 
-  if (!cmt_oid)
+  if (!found || !cmt_oid)
     return SVN_NO_ERROR; /* No actual changes in this revision*/
 
   SVN_ERR(find_commit(&commit, root, cmt_oid, pool));
@@ -975,11 +976,11 @@ fs_git_dir_entries(apr_hash_t **entries_
       for (hi = apr_hash_first(pool, branches); hi; hi = apr_hash_next(hi))
         {
           const char *name = apr_hash_this_key(hi);
-          const char *relpath = apr_hash_this_val(hi);
+          const char *itempath = apr_hash_this_val(hi);
 
           de = apr_pcalloc(pool, sizeof(*de));
           de->kind = svn_node_dir;
-          de->id = make_id(root, relpath, pool);
+          de->id = make_id(root, itempath, pool);
           de->name = name;
           svn_hash_sets(*entries_p, name, de);
         }



Mime
View raw message