mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
06f33c1735
Traditionally we used .gitattributes file from the work tree if exists,
and otherwise read from the index as a fallback. When switching to a
branch that has an updated .gitattributes file, and entries in it give
different attributes to other paths being checked out, we should instead
read from the .gitattributes in the index.
This breaks a use case of fixing incorrect entries in the .gitattributes
in the work tree (without adding it to the index) and checking other paths
out, though.
$ edit .gitattributes ;# mark foo.dat as binary
$ rm foo.dat
$ git checkout foo.dat
Signed-off-by: Junio C Hamano <gitster@pobox.com>
40 lines
960 B
C
40 lines
960 B
C
#ifndef ATTR_H
|
|
#define ATTR_H
|
|
|
|
/* An attribute is a pointer to this opaque structure */
|
|
struct git_attr;
|
|
|
|
/*
|
|
* Given a string, return the gitattribute object that
|
|
* corresponds to it.
|
|
*/
|
|
struct git_attr *git_attr(const char *, int);
|
|
|
|
/* 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_checkattr(), and
|
|
* each 'value' member tells what its value is.
|
|
* Unset one is returned as NULL.
|
|
*/
|
|
struct git_attr_check {
|
|
struct git_attr *attr;
|
|
const char *value;
|
|
};
|
|
|
|
int git_checkattr(const char *path, int, struct git_attr_check *);
|
|
|
|
enum git_attr_direction {
|
|
GIT_ATTR_CHECKIN,
|
|
GIT_ATTR_CHECKOUT
|
|
};
|
|
void git_attr_set_direction(enum git_attr_direction, struct index_state *);
|
|
|
|
#endif /* ATTR_H */
|