mirror of
https://github.com/git/git.git
synced 2024-11-17 22:44:49 +01:00
Merge branch 'jc/cache-tree' into next
* jc/cache-tree: Fix crash when reading the empty tree
This commit is contained in:
commit
2c4c17fbb9
1 changed files with 2 additions and 2 deletions
|
@ -881,8 +881,8 @@ int main(int argc, char **argv)
|
|||
* valid cache-tree because the index must match exactly
|
||||
* what came from the tree.
|
||||
*/
|
||||
if (trees->item && (!merge || (stage == 2))) {
|
||||
cache_tree_free(&active_cache_tree);
|
||||
if (trees && trees->item && (!merge || (stage == 2))) {
|
||||
cache_tree_free(&active_cache_tree);
|
||||
prime_cache_tree();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue