mirror of
https://github.com/git/git.git
synced 2024-11-25 19:04:18 +08:00
update-index: when --unresolve, smudge the relevant cache-tree entries.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
e7afa1115b
commit
497c32136f
@ -562,6 +562,7 @@ static int unresolve_one(const char *path)
|
||||
goto free_return;
|
||||
}
|
||||
|
||||
cache_tree_invalidate_path(active_cache_tree, path);
|
||||
remove_file_from_cache(path);
|
||||
if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
|
||||
error("%s: cannot add our version to the index.", path);
|
||||
|
Loading…
Reference in New Issue
Block a user