Merge branch 'jk/doc-config-include'

diff --git a/cache-tree.h b/cache-tree.h
index 41c574663a14840aa726c46c19b071fa6555f0ef..f7b9cab7ee87dd04cecbd25f34101a58fc002014 100644 (file)
--- a/cache-tree.h
+++ b/cache-tree.h
@@ -1,6 +1,7 @@
 #ifndef CACHE_TREE_H
 #define CACHE_TREE_H
 
+#include "cache.h"
 #include "tree.h"
 #include "tree-walk.h"
 
@@ -15,7 +16,7 @@ struct cache_tree_sub {
 
 struct cache_tree {
        int entry_count; /* negative means "invalid" */
-       unsigned char sha1[20];
+       struct object_id oid;
        int subtree_nr;
        int subtree_alloc;
        struct cache_tree_sub **down;