Merge branch 'jc/dirwalk-n-cache-tree' into next

* jc/dirwalk-n-cache-tree:

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-rm.c b/builtin-rm.c
index 9014c61556c80d2d37d7f59e9e9419d3b3ba9884..0beb86dc3dd13610da14afe77c96a2a1ea34573b 100644 (file)
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -117,6 +117,7 @@ int cmd_rm(int argc, const char **argv, char **envp)
 
                if (remove_file_from_cache(path))
                        die("git rm: unable to remove %s", path);
+               cache_tree_invalidate_path(active_cache_tree, path);
        }
 
        /*

diff --git a/read-tree.c b/read-tree.c
index a3ada55c1571e52fb3edf7c181ebfd000d7b8db6..55f7f87133c4a310855fe478452dbc51f6d28fca 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -801,7 +801,7 @@ static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
 {
        struct tree_entry_list *ent;
        int cnt;
-       
+
        memcpy(it->sha1, tree->object.sha1, 20);
        for (cnt = 0, ent = tree->entries; ent; ent = ent->next) {
                if (!ent->directory)