From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Jun 2008 21:34:09 +0000 (-0700)
Subject: Merge branch 'sn/static'
X-Git-Tag: v1.6.0-rc0~230
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6b8791982cec5b4ccc7874a83624af8596a5f2fe;hp=-c;p=git.git

Merge branch 'sn/static'

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

6b8791982cec5b4ccc7874a83624af8596a5f2fe
diff --combined cache.h
index 56ac6e7f4,814076300..d12ee7d0f
--- a/cache.h
+++ b/cache.h
@@@ -311,7 -311,6 +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);
@@@ -525,7 -524,6 +524,7 @@@ static inline int is_absolute_path(cons
  }
  const char *make_absolute_path(const char *path);
  const char *make_nonrelative_path(const char *path);
 +const char *make_relative_path(const char *abs, const char *base);
  
  /* Read and unpack a sha1 file into memory, write memory to a sha1 file */
  extern int sha1_object_info(const unsigned char *, unsigned long *);
@@@ -736,7 -734,6 +735,6 @@@ extern int git_config_set_multivar(cons
  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 *);