Skip to content

Commit

Permalink
Merge branch 'sn/static'
Browse files Browse the repository at this point in the history
* sn/static:
  config.c: make git_env_bool() static
  environment.c: remove unused function
  • Loading branch information
Junio C Hamano committed Jun 22, 2008
2 parents bc9c3e0 + e4bffb5 commit 6b87919
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 10 deletions.
2 changes: 0 additions & 2 deletions cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 *);
Expand Down
2 changes: 1 addition & 1 deletion config.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions environment.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6b87919

Please sign in to comment.