X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=read-tree.c;h=49436bf96fa4df29e4e12c587c2de4f9c68e7e21;hb=7f498065e9bf85f6f3e954ec57dedf56fec29e01;hp=66c0120f1352f8edf6ea1afcd037c96b373273a8;hpb=f476ce2061888a271766dcf3306bc8260852d99d;p=git.git

diff --git a/read-tree.c b/read-tree.c
index 66c0120f..49436bf9 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -446,6 +446,8 @@ static int merged_entry(struct cache_entry *merge, struct cache_entry *old)
 			invalidate_ce_path(old);
 		}
 	}
+	else
+		invalidate_ce_path(merge);
 	merge->ce_flags &= ~htons(CE_STAGEMASK);
 	add_cache_entry(merge, ADD_CACHE_OK_TO_ADD);
 	return 1;
@@ -879,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();
 	}