X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=cache.h;h=8d95fb25a2505a408aea4beba43409facb578213;hb=0814d6e554c45636f41856cc2204abe2f661560c;hp=83b1ec13963f9222b9988eacffcac98b95becd82;hpb=67c116bb26b4ee31889e5ee15d6a9d3b7e972b7b;p=git.git diff --git a/cache.h b/cache.h index 83b1ec139..8d95fb25a 100644 --- a/cache.h +++ b/cache.h @@ -438,7 +438,7 @@ extern int set_git_dir(const char *path); extern const char *get_git_namespace(void); extern const char *strip_namespace(const char *namespaced_ref); extern const char *get_git_work_tree(void); -extern const char *read_gitfile_gently(const char *path); +extern const char *read_gitfile(const char *path); extern void set_git_work_tree(const char *tree); #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES" @@ -589,6 +589,7 @@ extern int warn_ambiguous_refs; extern int shared_repository; extern const char *apply_default_whitespace; extern const char *apply_default_ignorewhitespace; +extern const char *git_attributes_file; extern int zlib_compression_level; extern int core_compression_level; extern int core_compression_seen;