mirror of
https://github.com/git/git.git
synced 2024-11-24 10:26:17 +08:00
603d249853
If o->merge is set, the struct traverse_info member conflicts is shifted left in unpack_callback, then passed through traverse_trees_recursive to unpack_nondirectories, where it is shifted right before use. Stop the shifting and just pass the conflict bit mask as is. Rename the member to df_conflicts to prove that it isn't used anywhere else. Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
77 lines
2.2 KiB
C
77 lines
2.2 KiB
C
#ifndef TREE_WALK_H
|
|
#define TREE_WALK_H
|
|
|
|
struct name_entry {
|
|
const unsigned char *sha1;
|
|
const char *path;
|
|
unsigned int mode;
|
|
};
|
|
|
|
struct tree_desc {
|
|
const void *buffer;
|
|
struct name_entry entry;
|
|
unsigned int size;
|
|
};
|
|
|
|
static inline const unsigned char *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
|
|
{
|
|
*pathp = desc->entry.path;
|
|
*modep = canon_mode(desc->entry.mode);
|
|
return desc->entry.sha1;
|
|
}
|
|
|
|
static inline int tree_entry_len(const struct name_entry *ne)
|
|
{
|
|
return (const char *)ne->sha1 - ne->path - 1;
|
|
}
|
|
|
|
void update_tree_entry(struct tree_desc *);
|
|
void init_tree_desc(struct tree_desc *desc, const void *buf, unsigned long size);
|
|
|
|
/*
|
|
* Helper function that does both tree_entry_extract() and update_tree_entry()
|
|
* and returns true for success
|
|
*/
|
|
int tree_entry(struct tree_desc *, struct name_entry *);
|
|
|
|
void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1);
|
|
|
|
struct traverse_info;
|
|
typedef int (*traverse_callback_t)(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *);
|
|
int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info);
|
|
|
|
struct traverse_info {
|
|
struct traverse_info *prev;
|
|
struct name_entry name;
|
|
int pathlen;
|
|
struct pathspec *pathspec;
|
|
|
|
unsigned long df_conflicts;
|
|
traverse_callback_t fn;
|
|
void *data;
|
|
int show_all_errors;
|
|
};
|
|
|
|
int get_tree_entry(const unsigned char *, const char *, unsigned char *, unsigned *);
|
|
extern char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n);
|
|
extern void setup_traverse_info(struct traverse_info *info, const char *base);
|
|
|
|
static inline int traverse_path_len(const struct traverse_info *info, const struct name_entry *n)
|
|
{
|
|
return info->pathlen + tree_entry_len(n);
|
|
}
|
|
|
|
/* in general, positive means "kind of interesting" */
|
|
enum interesting {
|
|
all_entries_not_interesting = -1, /* no, and no subsequent entries will be either */
|
|
entry_not_interesting = 0,
|
|
entry_interesting = 1,
|
|
all_entries_interesting = 2 /* yes, and all subsequent entries will be */
|
|
};
|
|
|
|
extern enum interesting tree_entry_interesting(const struct name_entry *,
|
|
struct strbuf *, int,
|
|
const struct pathspec *ps);
|
|
|
|
#endif
|