diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-11-20 14:42:58 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-11-20 14:42:59 +0900 |
| commit | 257f2de9644536964c02eed53271df89e132d4f4 (patch) | |
| tree | aab2dc6fa6d86b450689a87bd892d5d27f5b27c2 /cache-tree.h | |
| parent | 76c1953395770e5334a506eb59bc19ff4cd99e6c (diff) | |
| parent | ecb5c4318cd8b5bbb72f943b6128fe946ffcb56e (diff) | |
| download | git-257f2de9644536964c02eed53271df89e132d4f4.tar.gz | |
Merge branch 'ps/cache-tree-w-broken-index-entry' into maint-2.47
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 |