diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-03 15:02:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-03 15:02:59 -0700 |
| commit | d265ddce1fe3860f67bfe5491dd75b0e657d9062 (patch) | |
| tree | 34c12dfaee279dcbebd5f46fc32dd4c2936a7ad1 /cache-tree.h | |
| parent | c2eae0a5f604738b9ecce3d540ea48ceb0f2a869 (diff) | |
| parent | 83ae209bf9708bf1b67dbac4a3629a0003af5dbb (diff) | |
| download | git-d265ddce1fe3860f67bfe5491dd75b0e657d9062.tar.gz | |
Merge branch 'jc/maint-read-tree-multi' into maint
* jc/maint-read-tree-multi:
checkout branch: prime cache-tree fully
read-tree -m A B: prime cache-tree from the switched-to tree
Move prime_cache_tree() to cache-tree.c
read-tree A B: do not corrupt cache-tree
Diffstat (limited to 'cache-tree.h')
| -rw-r--r-- | cache-tree.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cache-tree.h b/cache-tree.h index cf8b790874..e958835236 100644 --- a/cache-tree.h +++ b/cache-tree.h @@ -1,6 +1,8 @@ #ifndef CACHE_TREE_H #define CACHE_TREE_H +#include "tree.h" + struct cache_tree; struct cache_tree_sub { struct cache_tree *cache_tree; @@ -33,4 +35,6 @@ int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int, int) #define WRITE_TREE_PREFIX_ERROR (-3) int write_cache_as_tree(unsigned char *sha1, int missing_ok, const char *prefix); +void prime_cache_tree(struct cache_tree **, struct tree *); + #endif |