undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sn/static'

Browse Source 
* sn/static:
  config.c: make git_env_bool() static
  environment.c: remove unused function
This commit is contained in:
Junio C Hamano 2008-06-22 14:34:09 -07:00
commit 6b8791982c
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cache.h
View File

@ -311,7 +311,6 @@ extern char *git_work_tree_cfg;
extern int is_inside_work_tree(void); extern int is_inside_work_tree(void);
extern const char *get_git_dir(void); extern const char *get_git_dir(void);
extern char *get_object_directory(void); extern char *get_object_directory(void);
extern char *get_refs_directory(void);
extern char *get_index_file(void); extern char *get_index_file(void);
extern char *get_graft_file(void); extern char *get_graft_file(void);
extern int set_git_dir(const char *path); 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 int git_config_rename_section(const char *, const char *);
extern const char *git_etc_gitconfig(void); extern const char *git_etc_gitconfig(void);
extern int check_repository_format_version(const char *var, const char *value, void *cb); 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_system(void);
extern int git_config_global(void); extern int git_config_global(void);
extern int config_error_nonbool(const char *); extern int config_error_nonbool(const char *);

2
config.c
View File

@ -549,7 +549,7 @@ const char *git_etc_gitconfig(void)
return system_wide; 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); const char *v = getenv(k);
return v ? git_config_bool(k, v) : def; return v ? git_config_bool(k, v) : def;

7
environment.c
View File

@ -129,13 +129,6 @@ char *get_object_directory(void)
return git_object_dir; 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) char *get_index_file(void)
{ {
if (!git_index_file) if (!git_index_file)