diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-09 13:40:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-09 13:40:32 -0700 |
| commit | 6d5c16a90ccf5724fb885d4b8af295c640da33a4 (patch) | |
| tree | df8b5876c2667924dbf78515091b2ec543ad597d /cache-tree.h | |
| parent | 00fb2d25632191b89ac4144e1a6498470a4a1c9e (diff) | |
| parent | 4cd675565647b2ccacdd6c93841b4ff06c32b16a (diff) | |
| download | git-6d5c16a90ccf5724fb885d4b8af295c640da33a4.tar.gz | |
Merge branch 'tr/cache-tree' into maint-1.7.8
* tr/cache-tree:
t0090: be prepared that 'wc -l' writes leading blanks
reset: update cache-tree data when appropriate
commit: write cache-tree data when writing index anyway
Refactor cache_tree_update idiom from commit
Test the current state of the cache-tree optimization
Add test-scrap-cache-tree
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 3df641f593..0ec0b2a159 100644 --- a/cache-tree.h +++ b/cache-tree.h @@ -29,7 +29,9 @@ 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 cache_tree_update(struct cache_tree *, struct cache_entry **, int, int, int, int); + +int update_main_cache_tree(int); /* bitmasks to write_cache_as_tree flags */ #define WRITE_TREE_MISSING_OK 1 |