kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jc/cache-tree' into next 

* jc/cache-tree:
  Fix crash when reading the empty tree
maint
Junio C Hamano 2006-05-07 16:06:44 -07:00
parent c2b9e6994d b6c4a480b3
commit 2c4c17fbb9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
read-tree.c
View File

@ -881,8 +881,8 @@ int main(int argc, char **argv)
* valid cache-tree because the index must match exactly * valid cache-tree because the index must match exactly
* what came from the tree. * what came from the tree.
*/ */
if (trees->item && (!merge || (stage == 2))) { if (trees && trees->item && (!merge || (stage == 2))) {
cache_tree_free(&active_cache_tree); cache_tree_free(&active_cache_tree);
prime_cache_tree(); prime_cache_tree();
} }