mirror of
https://github.com/git/git.git
synced 2024-11-23 18:05:29 +08:00
9f119599a6
The function `cache_tree_verify()` will `BUG()` whenever it finds that the cache-tree extension of the index is corrupt. The function is thus inherently untestable because the resulting call to `abort()` will be detected by our testing framework and labelled an error. And rightfully so: it shouldn't ever be possible to hit bugs, as they should indicate a programming error rather than corruption of on-disk state. Refactor the function to instead return error codes. This also ensures that the function can be used e.g. by git-fsck(1) without the whole process dying. Furthermore, this refactoring plugs some memory leaks when returning early by creating a common exit path. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
56 lines
1.7 KiB
C
56 lines
1.7 KiB
C
#ifndef CACHE_TREE_H
|
|
#define CACHE_TREE_H
|
|
|
|
#include "tree.h"
|
|
#include "tree-walk.h"
|
|
|
|
struct cache_tree;
|
|
struct cache_tree_sub {
|
|
struct cache_tree *cache_tree;
|
|
int count; /* internally used by update_one() */
|
|
int namelen;
|
|
int used;
|
|
char name[FLEX_ARRAY];
|
|
};
|
|
|
|
struct cache_tree {
|
|
int entry_count; /* negative means "invalid" */
|
|
struct object_id oid;
|
|
int subtree_nr;
|
|
int subtree_alloc;
|
|
struct cache_tree_sub **down;
|
|
};
|
|
|
|
struct cache_tree *cache_tree(void);
|
|
void cache_tree_free(struct cache_tree **);
|
|
void cache_tree_invalidate_path(struct index_state *, const char *);
|
|
struct cache_tree_sub *cache_tree_sub(struct cache_tree *, const char *);
|
|
|
|
int cache_tree_subtree_pos(struct cache_tree *it, const char *path, int pathlen);
|
|
|
|
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 index_state *, int);
|
|
int cache_tree_verify(struct repository *, struct index_state *);
|
|
|
|
/* bitmasks to write_index_as_tree flags */
|
|
#define WRITE_TREE_MISSING_OK 1
|
|
#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)
|
|
#define WRITE_TREE_UNMERGED_INDEX (-2)
|
|
#define WRITE_TREE_PREFIX_ERROR (-3)
|
|
|
|
struct tree* write_in_core_index_as_tree(struct repository *repo);
|
|
int write_index_as_tree(struct object_id *oid, struct index_state *index_state, const char *index_path, int flags, const char *prefix);
|
|
void prime_cache_tree(struct repository *, struct index_state *, struct tree *);
|
|
|
|
int cache_tree_matches_traversal(struct cache_tree *, struct name_entry *ent, struct traverse_info *info);
|
|
#endif
|