Merge branch 'jc/fetch-sorted' into next

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);
        }
 
        /*