Merge branch 'sg/diff-indent-heuristic-non-experimental'

diff --git a/cache-tree.c b/cache-tree.c
index 706ffcf1883a01d1ac6f3e966f9d10ebc2e1d8dd..c22161f987152ea18715b00815e987847786c5ff 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -713,7 +713,7 @@ static struct cache_tree *find_cache_tree_from_traversal(struct cache_tree *root
        if (!info->prev)
                return root;
        our_parent = find_cache_tree_from_traversal(root, info->prev);
-       return cache_tree_find(our_parent, info->name.path);
+       return cache_tree_find(our_parent, info->name);
 }
 
 int cache_tree_matches_traversal(struct cache_tree *root,