mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update-index: when --unresolve, smudge the relevant cache-tree entries.

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-04-26 22:05:05 -07:00
parent e7afa1115b
commit 497c32136f
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
update-index.c
View File

@ -562,6 +562,7 @@ static int unresolve_one(const char *path)
goto free_return; goto free_return;
} }
cache_tree_invalidate_path(active_cache_tree, path);
remove_file_from_cache(path); remove_file_from_cache(path);
if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) { if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
error("%s: cannot add our version to the index.", path); error("%s: cannot add our version to the index.", path);