diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-06-23 01:34:09 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-06-23 01:34:09 +0400 |
commit | 6b8791982cec5b4ccc7874a83624af8596a5f2fe (patch) | |
tree | 7fbd9408c273ddab6425958d5d988c120fd0521f | |
parent | bc9c3e0b932c5e14de749e07f5045197e7d6cd76 (diff) | |
parent | e4bffb5a1d9ab3c9c0ef0541a395d47516480d97 (diff) |
Merge branch 'sn/static'
* sn/static:
config.c: make git_env_bool() static
environment.c: remove unused function
-rw-r--r-- | cache.h | 2 | ||||
-rw-r--r-- | config.c | 2 | ||||
-rw-r--r-- | environment.c | 7 |
3 files changed, 1 insertions, 10 deletions
@@ -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 *); @@ -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 73feb2d03a..187248bf5d 100644 --- 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) |