diff options
| author | Russell Belfer <arrbee@arrbee.com> | 2012-01-20 11:13:17 -0800 |
|---|---|---|
| committer | Russell Belfer <arrbee@arrbee.com> | 2012-01-20 11:13:17 -0800 |
| commit | 63ab73bec0a54300a48355ee28dd24ebd39e2cd2 (patch) | |
| tree | b341b54a3b37d30b799a886f15729f537993e8c7 /src/attr_file.h | |
| parent | 9269ccce143578deec4d4e6e7755068f130abe96 (diff) | |
| parent | 83bfbdf593a76c591bb9cbd40cec6fca36c81a9c (diff) | |
| download | libgit2-63ab73bec0a54300a48355ee28dd24ebd39e2cd2.tar.gz | |
Merge branch 'fix-subdir-attr-paths' into development
This resolves issue #535 and issue #533.
Diffstat (limited to 'src/attr_file.h')
| -rw-r--r-- | src/attr_file.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/attr_file.h b/src/attr_file.h index 7190c4c7b..304c7a854 100644 --- a/src/attr_file.h +++ b/src/attr_file.h @@ -62,13 +62,16 @@ typedef struct { * git_attr_file API */ +extern int git_attr_file__new(git_attr_file **attrs_ptr); +extern void git_attr_file__free(git_attr_file *file); + extern int git_attr_file__from_buffer( - git_repository *repo, const char *buf, git_attr_file **out); + git_repository *repo, const char *buf, git_attr_file *file); extern int git_attr_file__from_file( - git_repository *repo, const char *path, git_attr_file **out); + git_repository *repo, const char *path, git_attr_file *file); -extern int git_attr_file__new(git_attr_file **attrs_ptr); -extern void git_attr_file__free(git_attr_file *file); +extern int git_attr_file__set_path( + git_repository *repo, const char *path, git_attr_file *file); extern int git_attr_file__lookup_one( git_attr_file *file, @@ -90,6 +93,7 @@ extern unsigned long git_attr_file__name_hash(const char *name); extern int git_attr_fnmatch__parse( git_attr_fnmatch *spec, + const char *source, const char **base); extern int git_attr_fnmatch__match( |