diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:47:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:47:30 -0700 |
| commit | c28a17f270a51a4ed5e432e83c0ed962361a37c9 (patch) | |
| tree | 6b7c829a56d0e09d8f0b80adb1d035889ce14d77 /cache-tree.h | |
| parent | deded16d151ff0f7b80ed21a518928daff09c14c (diff) | |
| parent | a0919ced8a5efe938cf97c74a0f851cbbe00aaf6 (diff) | |
| download | git-c28a17f270a51a4ed5e432e83c0ed962361a37c9.tar.gz git-c28a17f270a51a4ed5e432e83c0ed962361a37c9.tar.xz | |
Merge branch 'jc/cache-tree'
* jc/cache-tree:
Avoid "diff-index --cached" optimization under --find-copies-harder
Optimize "diff-index --cached" using cache-tree
t4007: modernize the style
cache-tree.c::cache_tree_find(): simplify internal API
write-tree --ignore-cache-tree
Diffstat (limited to 'cache-tree.h')
| -rw-r--r-- | cache-tree.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cache-tree.h b/cache-tree.h index e95883523..3df641f59 100644 --- a/cache-tree.h +++ b/cache-tree.h @@ -2,6 +2,7 @@ #define CACHE_TREE_H #include "tree.h" +#include "tree-walk.h" struct cache_tree; struct cache_tree_sub { @@ -30,11 +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 |