dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-04 15:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2006-05-03 16:07:02 -07:00
parent a84faf7770
commit c2b9ae4330
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
read-tree.c
View File

@@ -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;