Merge branch 'maint'

* maint: revert: Fix trivial comment style issue cache_tree_free: Fix small memory leak Conflicts: builtin/revert.c
git-mirror · Sep 7, 2010 · 7505ae2 · 7505ae2
2 parents 79d532c + 04df568
commit 7505ae2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/cache-tree.c b/cache-tree.c
@@ -22,8 +22,10 @@ void cache_tree_free(struct cache_tree **it_p)
 	if (!it)
 		return;
 	for (i = 0; i < it->subtree_nr; i++)
-		if (it->down[i])
+		if (it->down[i]) {
 			cache_tree_free(&it->down[i]->cache_tree);
+			free(it->down[i]);
+		}
 	free(it->down);
 	free(it);
 	*it_p = NULL;