summaryrefslogtreecommitdiff
path: root/cache-tree.h
diff options
context:
space:
mode:
Diffstat (limited to 'cache-tree.h')
-rw-r--r--cache-tree.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/cache-tree.h b/cache-tree.h
index cf8b790874..3df641f593 100644
--- a/cache-tree.h
+++ b/cache-tree.h
@@ -1,6 +1,9 @@
#ifndef CACHE_TREE_H
#define CACHE_TREE_H
+#include "tree.h"
+#include "tree-walk.h"
+
struct cache_tree;
struct cache_tree_sub {
struct cache_tree *cache_tree;
@@ -28,9 +31,18 @@ struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);
int cache_tree_fully_valid(struct cache_tree *);
int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int, int);
+/* bitmasks to write_cache_as_tree flags */
+#define WRITE_TREE_MISSING_OK 1
+#define WRITE_TREE_IGNORE_CACHE_TREE 2
+
+/* error return codes */
#define WRITE_TREE_UNREADABLE_INDEX (-1)
#define WRITE_TREE_UNMERGED_INDEX (-2)
#define WRITE_TREE_PREFIX_ERROR (-3)
-int write_cache_as_tree(unsigned char *sha1, int missing_ok, const char *prefix);
+int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix);
+void prime_cache_tree(struct cache_tree **, struct tree *);
+
+extern int cache_tree_matches_traversal(struct cache_tree *, struct name_entry *ent, struct traverse_info *info);
+
#endif