Merge branch 'mh/simplify-cache-tree-find'

diff --git a/cache-tree.c b/cache-tree.c
index d00f4ef7c2cb44392007e1f41cc2d0bc4d1e5c76..587b35362f18b3e98cd9e201a2de37c1878e852b 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -75,11 +75,7 @@ static struct cache_tree_sub *find_subtree(struct cache_tree *it,
                return NULL;
 
        pos = -pos-1;
-       if (it->subtree_alloc <= it->subtree_nr) {
-               it->subtree_alloc = alloc_nr(it->subtree_alloc);
-               it->down = xrealloc(it->down, it->subtree_alloc *
-                                   sizeof(*it->down));
-       }
+       ALLOC_GROW(it->down, it->subtree_nr + 1, it->subtree_alloc);
        it->subtree_nr++;
 
        down = xmalloc(sizeof(*down) + pathlen + 1);
@@ -555,18 +551,18 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat
                struct cache_tree_sub *sub;
 
                slash = strchrnul(path, '/');
-               /* between path and slash is the name of the
-                * subtree to look for.
+               /*
+                * Between path and slash is the name of the subtree
+                * to look for.
                 */
                sub = find_subtree(it, path, slash - path, 0);
                if (!sub)
                        return NULL;
                it = sub->cache_tree;
-               while (*slash && *slash == '/')
-                       slash++;
-               if (!*slash)
-                       return it; /* prefix ended with slashes */
+
                path = slash;
+               while (*path == '/')
+                       path++;
        }
        return it;
 }