 3cf773e426
			
		
	
	3cf773e426
	
	
	
		
			
			entry_count is used in update_one() for two purposes: 1. to skip through the number of processed entries in in-memory index 2. to record the number of entries this cache-tree covers on disk Unfortunately when CE_REMOVE is present these numbers are not the same because CE_REMOVE entries are automatically removed before writing to disk but entry_count is not adjusted and still counts CE_REMOVE entries. Separate the two use cases into two different variables. #1 is taken care by the new field count in struct cache_tree_sub and entry_count is prepared for #2. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			54 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			54 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #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;
 | |
| 	int count;		/* internally used by update_one() */
 | |
| 	int namelen;
 | |
| 	int used;
 | |
| 	char name[FLEX_ARRAY];
 | |
| };
 | |
| 
 | |
| struct cache_tree {
 | |
| 	int entry_count; /* negative means "invalid" */
 | |
| 	unsigned char sha1[20];
 | |
| 	int subtree_nr;
 | |
| 	int subtree_alloc;
 | |
| 	struct cache_tree_sub **down;
 | |
| };
 | |
| 
 | |
| struct cache_tree *cache_tree(void);
 | |
| void cache_tree_free(struct cache_tree **);
 | |
| void cache_tree_invalidate_path(struct cache_tree *, const char *);
 | |
| struct cache_tree_sub *cache_tree_sub(struct cache_tree *, const char *);
 | |
| 
 | |
| 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 update_main_cache_tree(int);
 | |
| 
 | |
| /* bitmasks to write_cache_as_tree flags */
 | |
| #define WRITE_TREE_MISSING_OK 1
 | |
| #define WRITE_TREE_IGNORE_CACHE_TREE 2
 | |
| #define WRITE_TREE_DRY_RUN 4
 | |
| #define WRITE_TREE_SILENT 8
 | |
| 
 | |
| /* 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 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
 |