X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=cache.h;h=38ad00661d5e0f5cc9f0d959c4c65c8c1ed238d9;hb=f48fd68887a03756658a46486a5dd1301c5a655f;hp=1b50c32b139256c5d8be96a85b02f1ce9855f15a;hpb=5838dffdcbe92bbbf50a29067fd9dc871155d76d;p=git.git

diff --git a/cache.h b/cache.h
index 1b50c32b1..38ad00661 100644
--- a/cache.h
+++ b/cache.h
@@ -151,6 +151,9 @@ enum object_type {
 #define CONFIG_ENVIRONMENT "GIT_CONFIG"
 #define CONFIG_LOCAL_ENVIRONMENT "GIT_CONFIG_LOCAL"
 #define EXEC_PATH_ENVIRONMENT "GIT_EXEC_PATH"
+#define GITATTRIBUTES_FILE ".gitattributes"
+#define INFOATTRIBUTES_FILE "info/attributes"
+#define ATTRIBUTE_MACRO_PREFIX "[attr]"
 
 extern int is_bare_repository_cfg;
 extern int is_bare_repository(void);
@@ -472,8 +475,8 @@ extern int pager_in_use;
 extern int pager_use_color;
 
 /* base85 */
-int decode_85(char *dst, char *line, int linelen);
-void encode_85(char *buf, unsigned char *data, int bytes);
+int decode_85(char *dst, const char *line, int linelen);
+void encode_85(char *buf, const unsigned char *data, int bytes);
 
 /* alloc.c */
 struct blob;
@@ -496,4 +499,7 @@ extern void trace_argv_printf(const char **argv, int count, const char *format,
 extern int convert_to_git(const char *path, char **bufp, unsigned long *sizep);
 extern int convert_to_working_tree(const char *path, char **bufp, unsigned long *sizep);
 
+/* match-trees.c */
+void shift_tree(const unsigned char *, const unsigned char *, unsigned char *, int);
+
 #endif /* CACHE_H */