From 996277c520641d650dc15ad751cc4ad33318e298 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Tue, 6 Dec 2011 18:43:37 +0100 Subject: Refactor cache_tree_update idiom from commit We'll need to safely create or update the cache-tree data of the_index from other places. While at it, give it an argument that lets us silence the messages produced by unmerged entries (which prevent it from working). Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- cache-tree.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'cache-tree.h') diff --git a/cache-tree.h b/cache-tree.h index 3df641f59..0ec0b2a15 100644 --- a/cache-tree.h +++ b/cache-tree.h @@ -29,7 +29,9 @@ void cache_tree_write(struct strbuf *, struct cache_tree *root); 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); +int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int, int, int); + +int update_main_cache_tree(int); /* bitmasks to write_cache_as_tree flags */ #define WRITE_TREE_MISSING_OK 1 -- cgit v1.2.1