subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bl...@apache.org
Subject svn commit: r1482495 - in /subversion/branches/1.8.x-r1469519-and-friends: ./ subversion/libsvn_fs_fs/tree.c
Date Tue, 14 May 2013 17:53:56 GMT
Author: blair
Date: Tue May 14 17:53:56 2013
New Revision: 1482495

URL: http://svn.apache.org/r1482495
Log:
On the 1.8.x-r1469519-and-friends branch: merge r1481870 from trunk.

Modified:
    subversion/branches/1.8.x-r1469519-and-friends/   (props changed)
    subversion/branches/1.8.x-r1469519-and-friends/subversion/libsvn_fs_fs/tree.c

Propchange: subversion/branches/1.8.x-r1469519-and-friends/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1481870

Modified: subversion/branches/1.8.x-r1469519-and-friends/subversion/libsvn_fs_fs/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1469519-and-friends/subversion/libsvn_fs_fs/tree.c?rev=1482495&r1=1482494&r2=1482495&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1469519-and-friends/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/branches/1.8.x-r1469519-and-friends/subversion/libsvn_fs_fs/tree.c Tue May
14 17:53:56 2013
@@ -913,22 +913,24 @@ open_path(parent_path_t **parent_path_p,
      a sibling of PATH has been presently accessed.  Try to start the lookup
      directly at the parent node, if the caller did not requested the full
      parent chain. */
-  const char *directory = NULL;
   assert(svn_fs__is_canonical_abspath(path));
   if (flags & open_path_node_only)
     {
-      directory = svn_dirent_dirname(path, pool);
+      const char *directory = svn_dirent_dirname(path, pool);
       if (directory[1] != 0) /* root nodes are covered anyway */
-        SVN_ERR(dag_node_cache_get(&here, root, directory, TRUE, pool));
+        {
+          SVN_ERR(dag_node_cache_get(&here, root, directory, TRUE, pool));
+          /* did the shortcut work? */
+          if (here)
+            {
+              path_so_far = directory;
+              rest = path + strlen(directory) + 1;
+            }
+        }
     }
 
   /* did the shortcut work? */
-  if (here)
-    {
-      path_so_far = directory;
-      rest = path + strlen(directory) + 1;
-    }
-  else
+  if (!here)
     {
       /* Make a parent_path item for the root node, using its own current
          copy id.  */



Mime
View raw message