diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-07-25 21:32:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-26 13:36:36 -0700 |
| commit | 8fd2cb4069178539d8cf7711586d4e6378722bf3 (patch) | |
| tree | 33db684a3460e85ec2bbfd0370db0012c90320b9 /cache.h | |
| parent | 24cf6e5847073d50390e0b7950e8e6b5a09103bc (diff) | |
| download | git-8fd2cb4069178539d8cf7711586d4e6378722bf3.tar.gz git-8fd2cb4069178539d8cf7711586d4e6378722bf3.tar.xz | |
Extract helper bits from c-merge-recursive work
This backports the pieces that are not uncooked from the merge-recursive
WIP we have seen earlier, to be used in git-mv rewritten in C.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -115,6 +115,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; +extern int cache_errno; #define GIT_DIR_ENVIRONMENT "GIT_DIR" #define DEFAULT_GIT_DIR_ENVIRONMENT ".git" @@ -142,6 +143,7 @@ extern void verify_non_filename(const char *prefix, const char *name); /* Initialize and use the cache information */ extern int read_cache(void); +extern int read_cache_from(const char *path); extern int write_cache(int newfd, struct cache_entry **cache, int entries); extern int verify_path(const char *path); extern int cache_name_pos(const char *name, int namelen); @@ -149,6 +151,7 @@ extern int cache_name_pos(const char *name, int namelen); #define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */ #define ADD_CACHE_SKIP_DFCHECK 4 /* Ok to skip DF conflict checks */ extern int add_cache_entry(struct cache_entry *ce, int option); +extern struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really); extern int remove_cache_entry_at(int pos); extern int remove_file_from_cache(const char *path); extern int ce_same_name(struct cache_entry *a, struct cache_entry *b); |