summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6d60bbe)
raw | patch | inline | side by side (parent: 6d60bbe)
author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
Sun, 7 May 2006 15:42:37 +0000 (17:42 +0200) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sun, 7 May 2006 20:54:46 +0000 (13:54 -0700) |
cvsimport needs to call git-read-tree without arguments to create an empty
tree.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
tree.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
read-tree.c | patch | blob | history |
diff --git a/read-tree.c b/read-tree.c
index 067fb95e9d552789e68e087abd9b5cf855690ceb..49436bf96fa4df29e4e12c587c2de4f9c68e7e21 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
* 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();
}