From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Feb 2008 01:56:51 +0000 (-0800)
Subject: Merge branch 'jk/noetcconfig'
X-Git-Tag: v1.5.5-rc0~210
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fef1c4c0a0766b83cfacaf6276d7bd0d1aa9a2e4;p=git.git

Merge branch 'jk/noetcconfig'

* jk/noetcconfig:
  fix config reading in tests
  allow suppressing of global and system config

Conflicts:

	cache.h
---

fef1c4c0a0766b83cfacaf6276d7bd0d1aa9a2e4
diff --cc cache.h
index cdcabe92b,af74e203b..efd31d856
--- a/cache.h
+++ b/cache.h
@@@ -631,7 -589,9 +631,10 @@@ 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);
+ 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 *);
  
  #define MAX_GITNAME (1000)
  extern char git_default_email[MAX_GITNAME];