| commit | 7505ae272bad53c6451f34ff5f04ad24f29b6dd9 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <gitster@pobox.com> | Mon Sep 06 17:40:18 2010 -0700 |
| committer | Junio C Hamano <gitster@pobox.com> | Mon Sep 06 17:40:18 2010 -0700 |
| tree | 0dab4d35ffe6f97b955a23c07fa6d8ce5edc2dec | |
| parent | 79d532c36a5d275ed237e196f36054f3c45d70aa [diff] | |
| parent | 04df568be53c42d07aea393effc7c5653f245d9a [diff] |
Merge branch 'maint' * maint: revert: Fix trivial comment style issue cache_tree_free: Fix small memory leak Conflicts: builtin/revert.c
diff --git a/cache-tree.c b/cache-tree.c index c60cf91..f755590 100644 --- a/cache-tree.c +++ b/cache-tree.c
@@ -22,8 +22,10 @@ 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;