diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-18 00:27:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-18 00:28:16 -0800 |
| commit | 03f94ae9f909952ed5a78917ab319a312889354b (patch) | |
| tree | 0fd041e8b390bd0d2a960ae629d8e965d363de92 /cache-tree.h | |
| parent | 2c47789d817aaf745a5ce5d5f79619c634cc8566 (diff) | |
| parent | 81b50f3ce40bfdd66e5d967bf82be001039a9a98 (diff) | |
| download | git-jk/maint-strbuf-missing-init.tar.gz | |
Update jk/maint-strbuf-missing-init to builtin/ renamejk/maint-strbuf-missing-init
Diffstat (limited to 'cache-tree.h')
| -rw-r--r-- | cache-tree.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/cache-tree.h b/cache-tree.h index cf8b790874..3df641f593 100644 --- a/cache-tree.h +++ b/cache-tree.h @@ -1,6 +1,9 @@ #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; @@ -28,9 +31,18 @@ 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); +/* bitmasks to write_cache_as_tree flags */ +#define WRITE_TREE_MISSING_OK 1 +#define WRITE_TREE_IGNORE_CACHE_TREE 2 + +/* 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 missing_ok, const char *prefix); +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 |