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

* jc/dirwalk-n-cache-tree: builtin-rm: squelch compiler warnings.
19 years ago · 95f5bddcd2
1 changed files with 1 additions and 0 deletions
--- a/builtin-rm.c
+++ b/builtin-rm.c
@ -6,6 +6,7 @@
				@@ -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>...";