diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2012-02-28 12:23:26 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-02-28 12:23:26 +0800 |
| commit | 508d1244dc8d38188c70e98207efa8a97d16b47c (patch) | |
| tree | fc8688b80be453755f8135df11bf1db2d247725a /cache-tree.h | |
| parent | 0ad9e96d2e2f42f4d2ce7cd612bf741913242bc0 (diff) | |
| parent | 25a7850a106ed0f27b88b8ce0b89fd326120dff4 (diff) | |
| download | git-508d1244dc8d38188c70e98207efa8a97d16b47c.tar.gz | |
Merge branch 'master' into git-po
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) |