git-svnimport: Improved detection of merges.

diff --git a/builtin-rm.c b/builtin-rm.c
index 9014c61556c80d2d37d7f59e9e9419d3b3ba9884..e7793a20f5c38ff31d4a74b7e1cec50b9a9f252e 100644 (file)
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -6,6 +6,7 @@
 #include "cache.h"
 #include "builtin.h"
 #include "dir.h"
+#include "cache-tree.h"
 
 static const char builtin_rm_usage[] =
 "git-rm [-n] [-v] [-f] <filepattern>...";
@@ -117,6 +118,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);
        }
 
        /*