Merge branch 'maint-1.6.1' into maint-1.6.2

diff --git a/builtin-checkout.c b/builtin-checkout.c
index b121fe56de884867b31aeeb5bd704bdaf0310310..ffdb33aef596740890362a0e237d33131a906f45 100644 (file)
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -5,6 +5,7 @@
 #include "commit.h"
 #include "tree.h"
 #include "tree-walk.h"
+#include "cache-tree.h"
 #include "unpack-trees.h"
 #include "dir.h"
 #include "run-command.h"