Merge branch 'sn/static'

* sn/static:
config.c: make git_env_bool() static
environment.c: remove unused function

diff --git a/cache.h b/cache.h
index 56ac6e7f4702d0c1665c73e8fc44cfc047bcfd33..d12ee7d0f5de3ca5ff64359dcf99d0982ae27263 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -311,7 +311,6 @@ extern char *git_work_tree_cfg;
 extern int is_inside_work_tree(void);
 extern const char *get_git_dir(void);
 extern char *get_object_directory(void);
-extern char *get_refs_directory(void);
 extern char *get_index_file(void);
 extern char *get_graft_file(void);
 extern int set_git_dir(const char *path);
@@ -736,7 +735,6 @@ extern int git_config_set_multivar(const char *, const char *, const char *, int
 extern int git_config_rename_section(const char *, const char *);
 extern const char *git_etc_gitconfig(void);
 extern int check_repository_format_version(const char *var, const char *value, void *cb);
-extern int git_env_bool(const char *, int);
 extern int git_config_system(void);
 extern int git_config_global(void);
 extern int config_error_nonbool(const char *);

diff --git a/config.c b/config.c
index c2f2bbb000cd003002c1bd346e6be6c9d3ef5c2d..04d97e3d0b3a202868d3a8645710cc387f14443f 100644 (file)
--- a/config.c
+++ b/config.c
@@ -549,7 +549,7 @@ const char *git_etc_gitconfig(void)
        return system_wide;
 }
 
-int git_env_bool(const char *k, int def)
+static int git_env_bool(const char *k, int def)
 {
        const char *v = getenv(k);
        return v ? git_config_bool(k, v) : def;

diff --git a/environment.c b/environment.c
index 73feb2d03a917d1fbdc8d9397b42fd90e5916bca..187248bf5d027c8d860ccbf839bc6296d0a42436 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -129,13 +129,6 @@ char *get_object_directory(void)
        return git_object_dir;
 }
 
-char *get_refs_directory(void)
-{
-       if (!git_refs_dir)
-               setup_git_env();
-       return git_refs_dir;
-}
-
 char *get_index_file(void)
 {
        if (!git_index_file)