diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:42:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:42:42 -0800 |
| commit | a7844827da8273dcf030b9313bc381da3eac011d (patch) | |
| tree | 81389bdb7fb1f90d5d4388aa6875f56cc3e0008d /cache-tree.h | |
| parent | 75f49651a1b947e2eadd2c831b30892c0f4565c8 (diff) | |
| parent | e859c69b26528a55bd64f4eee2ed06fad999d862 (diff) | |
| download | git-a7844827da8273dcf030b9313bc381da3eac011d.tar.xz | |
Merge branch 'nd/cache-tree-api-refactor'
* nd/cache-tree-api-refactor:
cache-tree: update API to take abitrary flags
Diffstat (limited to 'cache-tree.h')
| -rw-r--r-- | cache-tree.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cache-tree.h b/cache-tree.h index 0ec0b2a159..d8cb2e9e39 100644 --- a/cache-tree.h +++ b/cache-tree.h @@ -29,13 +29,15 @@ void cache_tree_write(struct strbuf *, struct cache_tree *root); 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, int); +int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int); int update_main_cache_tree(int); /* bitmasks to write_cache_as_tree flags */ #define WRITE_TREE_MISSING_OK 1 #define WRITE_TREE_IGNORE_CACHE_TREE 2 +#define WRITE_TREE_DRY_RUN 4 +#define WRITE_TREE_SILENT 8 /* error return codes */ #define WRITE_TREE_UNREADABLE_INDEX (-1) |