Merge branch 'jc/grep' into next

diff --git a/update-index.c b/update-index.c
index 258a88cbeac7edc103b94446198383628c2e19cb..1c1f13bd7044ad78800b4f9faa0ff1b05b9b6c21 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);