X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cache.h;h=b1300cd989437e4631d6e4a58b1c32941b5c3b6b;hb=cee1b9549b4ffd7c98060555c6c98520827877e7;hp=b3e8de42709aa6607bea746e2af118ba144bbd85;hpb=83262ec139e5012e20fddb30aabcd8d7c9f64e34;p=git.git

diff --git a/cache.h b/cache.h
index b3e8de42..b1300cd9 100644
--- a/cache.h
+++ b/cache.h
@@ -170,7 +170,7 @@ extern void rollback_index_file(struct cache_file *);
 /* Environment bits from configuration mechanism */
 extern int trust_executable_bit;
 extern int assume_unchanged;
-extern int only_use_symrefs;
+extern int prefer_symlink_refs;
 extern int warn_ambiguous_refs;
 extern int diff_rename_limit_default;
 extern int shared_repository;
@@ -252,6 +252,7 @@ extern void *read_object_with_reference(const unsigned char *sha1,
 					unsigned char *sha1_ret);
 
 const char *show_date(unsigned long time, int timezone);
+const char *show_rfc2822_date(unsigned long time, int timezone);
 int parse_date(const char *date, char *buf, int bufsize);
 void datestamp(char *buf, int bufsize);
 unsigned long approxidate(const char *);
@@ -364,4 +365,8 @@ extern int receive_keep_pack(int fd[2], const char *me, int quiet);
 /* pager.c */
 extern void setup_pager(void);
 
+/* base85 */
+int decode_85(char *dst, char *line, int linelen);
+void encode_85(char *buf, unsigned char *data, int bytes);
+
 #endif /* CACHE_H */