vendor/libgit2/src/attr_file.h in rugged-1.3.2.3 vs vendor/libgit2/src/attr_file.h in rugged-1.4.2
- old
+ new
@@ -11,11 +11,11 @@
#include "git2/oid.h"
#include "git2/attr.h"
#include "vector.h"
#include "pool.h"
-#include "buffer.h"
+#include "str.h"
#include "futils.h"
#define GIT_ATTR_FILE ".gitattributes"
#define GIT_ATTR_FILE_INREPO "attributes"
#define GIT_ATTR_FILE_SYSTEM "gitattributes"
@@ -116,11 +116,11 @@
const char *path; /* points into fullpath */
char fullpath[GIT_FLEX_ARRAY];
};
typedef struct {
- git_buf full;
+ git_str full;
char *path;
char *basename;
int is_dir;
} git_attr_path;
@@ -130,11 +130,11 @@
typedef struct {
int key;
unsigned int init_setup:1,
init_sysdir:1;
- git_buf sysdir;
- git_buf tmp;
+ git_str sysdir;
+ git_str tmp;
} git_attr_session;
extern int git_attr_session__init(git_attr_session *attr_session, git_repository *repo);
extern void git_attr_session__free(git_attr_session *session);