X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cache.h;fp=cache.h;h=a080727b006a2157570188f1d5fce66b902fc2b8;hb=bad68ec92410cf47dd001aa9b95d0f24c5f4bf77;hp=8c9947ef49846151fe4b25e6c472864bfa7d9f71;hpb=dd0c34c46bdda0c20fd92d00516e711a4c9f7837;p=git.git diff --git a/cache.h b/cache.h index 8c9947ef..a080727b 100644 --- a/cache.h +++ b/cache.h @@ -114,6 +114,7 @@ static inline unsigned int create_ce_mode(unsigned int mode) extern struct cache_entry **active_cache; extern unsigned int active_nr, active_alloc, active_cache_changed; +extern struct cache_tree *active_cache_tree; #define GIT_DIR_ENVIRONMENT "GIT_DIR" #define DEFAULT_GIT_DIR_ENVIRONMENT ".git" @@ -138,11 +139,8 @@ extern const char *prefix_filename(const char *prefix, int len, const char *path #define alloc_nr(x) (((x)+16)*3/2) /* Initialize and use the cache information */ -extern int read_cache_1(unsigned char *); -extern int write_cache_1(int, struct cache_entry **, int, unsigned char *); extern int read_cache(void); -extern int write_cache(int, struct cache_entry **, int); - +extern int write_cache(int newfd, struct cache_entry **cache, int entries); extern int cache_name_pos(const char *name, int namelen); #define ADD_CACHE_OK_TO_ADD 1 /* Ok to add */ #define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */