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>
Junio C Hamano committed
May 3, 2006 at 16:07 UTC
c2b9ae43303342a33b2632939f319a3554f3a70c
1 file changed
+2
read-tree.c
+2
@@ -446,6 +446,8 @@ static int merged_entry(struct cache_entry *merge, struct cache_entry *old)
446
invalidate_ce_path(old);
447
}
448
}
449
+ else
450
+ invalidate_ce_path(merge);
451
merge->ce_flags &= ~htons(CE_STAGEMASK);
452
add_cache_entry(merge, ADD_CACHE_OK_TO_ADD);
453
return 1;