Merge branch 'maint'

diff --git a/cache-tree.h b/cache-tree.h
index 8243228e49ffd7078a783582be6ce79c97541a9c..cf8b790874c4a4f5890b360c237ccdd4a5a03de4 100644 (file)
--- a/cache-tree.h
+++ b/cache-tree.h
@@ -28,6 +28,9 @@ 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);
 
-struct cache_tree *cache_tree_find(struct cache_tree *, const char *);
+#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);
 #endif