diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-07 23:06:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-07 23:06:44 (GMT) |
| commit | 2c4c17fbb9c26cdc411126a2c5365e3fc3a0242a (patch) | |
| tree | 9b3d7c0f8c7ce05c3114c21a2f280b0fa4a9e0de | |
| parent | c2b9e6994d044b218e59abf6d19f7751c4aa13e3 (diff) | |
| parent | b6c4a480b3161effaa3578df91d8cdc83044d7b6 (diff) | |
| download | git-2c4c17fbb9c26cdc411126a2c5365e3fc3a0242a.zip git-2c4c17fbb9c26cdc411126a2c5365e3fc3a0242a.tar.gz git-2c4c17fbb9c26cdc411126a2c5365e3fc3a0242a.tar.bz2 | |
Merge branch 'jc/cache-tree' into next
* jc/cache-tree:
Fix crash when reading the empty tree
| -rw-r--r-- | read-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/read-tree.c b/read-tree.c index 067fb95..49436bf 100644 --- a/read-tree.c +++ b/read-tree.c @@ -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(); } |