7a400a2c02
Make the attr API take an index_state instead of assuming the_index in
attr code. All call sites are converted blindly to keep the patch
simple and retain current behavior. Individual call sites may receive
further updates to use the right index instead of the_index.
There is one ugly temporary workaround added in attr.c that needs some
more explanation.
Commit c24f3abace (apply: file commited with CRLF should roundtrip
diff and apply - 2017-08-19) forces one convert_to_git() call to NOT
read the index at all. But what do you know, we read it anyway by
falling back to the_index. When "istate" from convert_to_git is now
propagated down to read_attr_from_array() we will hit segfault
somewhere inside read_blob_data_from_index.
The right way of dealing with this is to kill "use_index" variable and
only follow "istate" but at this stage we are not ready for that:
while most git_attr_set_direction() calls just passes the_index to be
assigned to use_index, unpack-trees passes a different one which is
used by entry.c code, which has no way to know what index to use if we
delete use_index. So this has to be done later.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
86 lines
2.2 KiB
C
86 lines
2.2 KiB
C
#ifndef ATTR_H
|
|
#define ATTR_H
|
|
|
|
struct index_state;
|
|
|
|
/* An attribute is a pointer to this opaque structure */
|
|
struct git_attr;
|
|
|
|
/* opaque structures used internally for attribute collection */
|
|
struct all_attrs_item;
|
|
struct attr_stack;
|
|
|
|
/*
|
|
* Given a string, return the gitattribute object that
|
|
* corresponds to it.
|
|
*/
|
|
const struct git_attr *git_attr(const char *);
|
|
|
|
/* Internal use */
|
|
extern const char git_attr__true[];
|
|
extern const char git_attr__false[];
|
|
|
|
/* For public to check git_attr_check results */
|
|
#define ATTR_TRUE(v) ((v) == git_attr__true)
|
|
#define ATTR_FALSE(v) ((v) == git_attr__false)
|
|
#define ATTR_UNSET(v) ((v) == NULL)
|
|
|
|
/*
|
|
* Send one or more git_attr_check to git_check_attrs(), and
|
|
* each 'value' member tells what its value is.
|
|
* Unset one is returned as NULL.
|
|
*/
|
|
struct attr_check_item {
|
|
const struct git_attr *attr;
|
|
const char *value;
|
|
};
|
|
|
|
struct attr_check {
|
|
int nr;
|
|
int alloc;
|
|
struct attr_check_item *items;
|
|
int all_attrs_nr;
|
|
struct all_attrs_item *all_attrs;
|
|
struct attr_stack *stack;
|
|
};
|
|
|
|
struct attr_check *attr_check_alloc(void);
|
|
struct attr_check *attr_check_initl(const char *, ...);
|
|
struct attr_check *attr_check_dup(const struct attr_check *check);
|
|
|
|
struct attr_check_item *attr_check_append(struct attr_check *check,
|
|
const struct git_attr *attr);
|
|
|
|
void attr_check_reset(struct attr_check *check);
|
|
void attr_check_clear(struct attr_check *check);
|
|
void attr_check_free(struct attr_check *check);
|
|
|
|
/*
|
|
* Return the name of the attribute represented by the argument. The
|
|
* return value is a pointer to a null-delimited string that is part
|
|
* of the internal data structure; it should not be modified or freed.
|
|
*/
|
|
const char *git_attr_name(const struct git_attr *);
|
|
|
|
int git_check_attr(const struct index_state *istate,
|
|
const char *path, struct attr_check *check);
|
|
|
|
/*
|
|
* Retrieve all attributes that apply to the specified path.
|
|
* check holds the attributes and their values.
|
|
*/
|
|
void git_all_attrs(const struct index_state *istate,
|
|
const char *path, struct attr_check *check);
|
|
|
|
enum git_attr_direction {
|
|
GIT_ATTR_CHECKIN,
|
|
GIT_ATTR_CHECKOUT,
|
|
GIT_ATTR_INDEX
|
|
};
|
|
void git_attr_set_direction(enum git_attr_direction new_direction,
|
|
const struct index_state *istate);
|
|
|
|
void attr_start(void);
|
|
|
|
#endif /* ATTR_H */
|