Merge git://git2.kernel.org/pub/scm/gitk/gitk

diff --git a/tree.c b/tree.c
index 46923ee61bcce99e677abcc37e233359d39cc9fc..24f8fb676650ff0c95baffe79966219fa026f09f 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -153,10 +153,8 @@ static void track_tree_refs(struct tree *item)
        /* Count how many entries there are.. */
        desc.buf = item->buffer;
        desc.size = item->size;
-       while (desc.size) {
+       while (tree_entry(&desc, &entry))
                n_refs++;
-               update_tree_entry(&desc);
-       }
 
        /* Allocate object refs and walk it again.. */
        i = 0;