diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-09-06 17:40:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-06 17:40:18 -0700 |
| commit | 7505ae272bad53c6451f34ff5f04ad24f29b6dd9 (patch) | |
| tree | 0dab4d35ffe6f97b955a23c07fa6d8ce5edc2dec | |
| parent | Merge branch 'jh/clean-exclude' (diff) | |
| parent | revert: Fix trivial comment style issue (diff) | |
| download | tgif-7505ae272bad53c6451f34ff5f04ad24f29b6dd9.tar.xz | |
Merge branch 'maint'
* maint:
revert: Fix trivial comment style issue
cache_tree_free: Fix small memory leak
Conflicts:
builtin/revert.c
| -rw-r--r-- | cache-tree.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cache-tree.c b/cache-tree.c index c60cf9140d..f755590da8 100644 --- 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; |