Merge branch 'jc/cache-tree' into next

diff --git a/update-index.c b/update-index.c
index 258a88cbeac7edc103b94446198383628c2e19cb..4c6bcfaedd6cd6bb53c0d783ef49fcd24b191850 100644 (file)
--- a/update-index.c
+++ b/update-index.c
@@ -8,6 +8,7 @@
 #include "quote.h"
 #include "cache-tree.h"
 #include "tree-walk.h"
+#include "cache-tree.h"
 
 /*
  * Default to not allowing changes to the list of files. The
@@ -562,6 +563,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);