diff options
| author | Taylor Blau <me@ttaylorr.com> | 2024-10-22 14:40:38 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2024-10-22 14:40:38 -0400 |
| commit | 6ca9a05e63608a386f9dec50110725954c41216a (patch) | |
| tree | 7c565796809f4621f165740f6e9735ab540996b1 /cache-tree.h | |
| parent | The third batch (diff) | |
| parent | unpack-trees: detect mismatching number of cache-tree/index entries (diff) | |
| download | git-6ca9a05e63608a386f9dec50110725954c41216a.tar.gz git-6ca9a05e63608a386f9dec50110725954c41216a.zip | |
Merge branch 'ps/cache-tree-w-broken-index-entry'
Fail gracefully instead of crashing when attempting to write the
contents of a corrupt in-core index as a tree object.
* ps/cache-tree-w-broken-index-entry:
unpack-trees: detect mismatching number of cache-tree/index entries
cache-tree: detect mismatching number of index entries
cache-tree: refactor verification to return error codes
Diffstat (limited to 'cache-tree.h')
| -rw-r--r-- | cache-tree.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cache-tree.h b/cache-tree.h index faae88be63..b82c4963e7 100644 --- a/cache-tree.h +++ b/cache-tree.h @@ -33,7 +33,7 @@ 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 index_state *, int); -void cache_tree_verify(struct repository *, struct index_state *); +int cache_tree_verify(struct repository *, struct index_state *); /* bitmasks to write_index_as_tree flags */ #define WRITE_TREE_MISSING_OK 1 |