diff options
author | Linus Torvalds <torvalds@osdl.org> | 2006-05-19 09:56:35 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-05-19 15:59:18 -0700 |
commit | 405e5b2fe0cf20b0eea41ca892f416c218b49f59 (patch) | |
tree | 0e211548f57590d05eab3d266584c7cad26794bc /cache.h | |
parent | c3c8835fbb182d971d71939b9a3ec7c8b86d6caf (diff) | |
download | git-405e5b2fe0cf20b0eea41ca892f416c218b49f59.tar.gz git-405e5b2fe0cf20b0eea41ca892f416c218b49f59.tar.xz |
Libify the index refresh logic
This cleans up and libifies the "git update-index --[really-]refresh"
functionality. This will be eventually required for eventually doing the
"commit" and "status" commands as built-ins.
It really just moves "refresh_index()" from update-index.c to
read-cache.c, but it also has to change the calling convention so that the
function uses a "unsigned int flags" argument instead of various static
flags variables for passing down the information about whether to be quiet
or not, and allow unmerged entries etc.
That actually cleans up update-index.c too, since it turns out that all
those flags were really specific to that one function of the index update,
so they shouldn't have had file-scope visibility even before.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -158,6 +158,12 @@ extern int index_pipe(unsigned char *sha1, int fd, const char *type, int write_o extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object); extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st); +#define REFRESH_REALLY 0x0001 /* ignore_valid */ +#define REFRESH_UNMERGED 0x0002 /* allow unmerged */ +#define REFRESH_QUIET 0x0004 /* be quiet about it */ +#define REFRESH_IGNORE_MISSING 0x0008 /* ignore non-existent */ +extern int refresh_cache(unsigned int flags); + struct cache_file { struct cache_file *next; char lockfile[PATH_MAX]; |