Merge branch 'jc/cache-tree' into next

diff --git a/tree-walk.h b/tree-walk.h
index 76893e36c32e11bb62ed50a29198b028f3e03088..47438fe1c08a8e119fd08aea0eac612c76c21a66 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -22,4 +22,6 @@ typedef void (*traverse_callback_t)(int n, unsigned long mask, struct name_entry
 
 void traverse_trees(int n, struct tree_desc *t, const char *base, traverse_callback_t callback);
 
+int get_tree_entry(const unsigned char *, const char *, unsigned char *, unsigned *);
+
 #endif