X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=cache.h;h=f9b367f3142b9841a737b0738bb2a422922885ce;hb=e44eb3e4c74c5f6c1fca1cf92ddb454ad248c24c;hp=de53f41287419a53e8f7b3c7669316dca6571d7e;hpb=ab9cb76f661c1794800361c27bc5a515245aaaef;p=git.git

diff --git a/cache.h b/cache.h
index de53f4128..f9b367f31 100644
--- a/cache.h
+++ b/cache.h
@@ -147,8 +147,10 @@ extern char *get_graft_file(void);
 #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"
 
 extern const char **get_pathspec(const char *prefix, const char **pathspec);
+extern const char *setup_git_directory_gently(int *);
 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);
 
 #define alloc_nr(x) (((x)+16)*3/2)
 
@@ -387,6 +389,7 @@ extern int gitfakemunmap(void *start, size_t length);
 
 typedef int (*config_fn_t)(const char *, const char *);
 extern int git_default_config(const char *, const char *);
+extern int git_config_from_file(config_fn_t fn, const char *);
 extern int git_config(config_fn_t fn);
 extern int git_config_int(const char *, const char *);
 extern int git_config_bool(const char *, const char *);
@@ -398,6 +401,9 @@ extern int check_repository_format_version(const char *var, const char *value);
 extern char git_default_email[MAX_GITNAME];
 extern char git_default_name[MAX_GITNAME];
 
+#define MAX_ENCODING_LENGTH 64
+extern char git_commit_encoding[MAX_ENCODING_LENGTH];
+
 /* Sane ctype - no locale, and works with signed chars */
 #undef isspace
 #undef isdigit