Merge branch 'maint'
* maint: revert: Fix trivial comment style issue cache_tree_free: Fix small memory leak Conflicts: builtin/revert.c
This commit is contained in:
commit
7505ae272b
@ -22,8 +22,10 @@ void cache_tree_free(struct cache_tree **it_p)
|
|||||||
if (!it)
|
if (!it)
|
||||||
return;
|
return;
|
||||||
for (i = 0; i < it->subtree_nr; i++)
|
for (i = 0; i < it->subtree_nr; i++)
|
||||||
if (it->down[i])
|
if (it->down[i]) {
|
||||||
cache_tree_free(&it->down[i]->cache_tree);
|
cache_tree_free(&it->down[i]->cache_tree);
|
||||||
|
free(it->down[i]);
|
||||||
|
}
|
||||||
free(it->down);
|
free(it->down);
|
||||||
free(it);
|
free(it);
|
||||||
*it_p = NULL;
|
*it_p = NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user