diff options
Diffstat (limited to 'cache-tree.h')
| -rw-r--r-- | cache-tree.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/cache-tree.h b/cache-tree.h index f7b9cab7ee..757bbc48bc 100644 --- a/cache-tree.h +++ b/cache-tree.h @@ -32,8 +32,7 @@ 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 index_state *, int); - -int update_main_cache_tree(int); +void cache_tree_verify(struct repository *, struct index_state *); /* bitmasks to write_cache_as_tree flags */ #define WRITE_TREE_MISSING_OK 1 @@ -47,10 +46,23 @@ int update_main_cache_tree(int); #define WRITE_TREE_UNMERGED_INDEX (-2) #define WRITE_TREE_PREFIX_ERROR (-3) -int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, const char *index_path, int flags, const char *prefix); -int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix); -void prime_cache_tree(struct index_state *, struct tree *); +int write_index_as_tree(struct object_id *oid, struct index_state *index_state, const char *index_path, int flags, const char *prefix); +void prime_cache_tree(struct repository *, struct index_state *, struct tree *); + +int cache_tree_matches_traversal(struct cache_tree *, struct name_entry *ent, struct traverse_info *info); -extern int cache_tree_matches_traversal(struct cache_tree *, struct name_entry *ent, struct traverse_info *info); +#ifdef USE_THE_INDEX_COMPATIBILITY_MACROS +static inline int write_cache_as_tree(struct object_id *oid, int flags, const char *prefix) +{ + return write_index_as_tree(oid, &the_index, get_index_file(), flags, prefix); +} + +static inline int update_main_cache_tree(int flags) +{ + if (!the_index.cache_tree) + the_index.cache_tree = cache_tree(); + return cache_tree_update(&the_index, flags); +} +#endif #endif |