read-tree: invalidate cache-tree entry when a new index entry is added.

When doing two-way merge, we failed to invalidate the directory that a new entry is added (we correctly did so for modified and deleted entries). Signed-off-by: Junio C Hamano <junkio@cox.net>
git-mirror · May 3, 2006 · c2b9ae4 · c2b9ae4
1 parent a84faf7
commit c2b9ae4
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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;