projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
update-index: when --unresolve, smudge the relevant cache-tree entries.
[git.git]
/
update-index.c
diff --git
a/update-index.c
b/update-index.c
index
258a88c
..
1c1f13b
100644
(file)
--- a/
update-index.c
+++ b/
update-index.c
@@
-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);