Merge branch 'vb/sendemail' into next

diff --git a/checkout-index.c b/checkout-index.c
index cc3a745c149b38ae250ac5656bb4a4843a95f6a4..9876af6fd60a81d871e6be30060cc93d0e0259c7 100644 (file)
--- a/checkout-index.c
+++ b/checkout-index.c
@@ -39,6 +39,7 @@
 #include "cache.h"
 #include "strbuf.h"
 #include "quote.h"
+#include "cache-tree.h"
 
 #define CHECKOUT_ALL 4
 static const char *prefix;