diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:32 -0700 |
| commit | 3fd13cbcd58f078476cabab926931a3d5bdedfe2 (patch) | |
| tree | d8126c3dea8b3c7189165db37a6b7978480943e8 /cache-tree.h | |
| parent | 01d678a2263c0c71e42475335b5b0b578936a7d1 (diff) | |
| parent | 4ed115e9c545fb27a5b80c751b2c04ec7ecc4d97 (diff) | |
| download | git-3fd13cbcd58f078476cabab926931a3d5bdedfe2.tar.gz | |
Merge branch 'dt/cache-tree-repair'
Add a few more places in "commit" and "checkout" that make sure
that the cache-tree is fully populated in the index.
* dt/cache-tree-repair:
cache-tree: do not try to use an invalidated subtree info to build a tree
cache-tree: Write updated cache-tree after commit
cache-tree: subdirectory tests
test-dump-cache-tree: invalid trees are not errors
cache-tree: create/update cache-tree on checkout
Diffstat (limited to 'cache-tree.h')
| -rw-r--r-- | cache-tree.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cache-tree.h b/cache-tree.h index b47ccec7f6..aa7b3e4a0a 100644 --- a/cache-tree.h +++ b/cache-tree.h @@ -39,6 +39,7 @@ int update_main_cache_tree(int); #define WRITE_TREE_IGNORE_CACHE_TREE 2 #define WRITE_TREE_DRY_RUN 4 #define WRITE_TREE_SILENT 8 +#define WRITE_TREE_REPAIR 16 /* error return codes */ #define WRITE_TREE_UNREADABLE_INDEX (-1) |