X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cache.h;h=4b7a4392531dd4064694cd346fef902a2b1930e9;hb=a62be77f5ebdbbd46d6956dc4d07571835588389;hp=4d8fabc6d8f3059d12640b66e6cf124c77022d07;hpb=e5de2c5e308a23b8f1531bbac2f100af7ab0767b;p=git.git diff --git a/cache.h b/cache.h index 4d8fabc6..4b7a4392 100644 --- a/cache.h +++ b/cache.h @@ -135,6 +135,7 @@ extern const char *setup_git_directory(void); extern const char *prefix_path(const char *prefix, int len, const char *path); extern const char *prefix_filename(const char *prefix, int len, const char *path); extern void verify_filename(const char *prefix, const char *name); +extern void verify_non_filename(const char *prefix, const char *name); #define alloc_nr(x) (((x)+16)*3/2) @@ -168,7 +169,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; @@ -362,4 +363,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 */