Merge branch 'jk/noetcconfig'

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

Conflicts:

	cache.h

diff --cc builtin-config.c
Simple merge

diff --cc cache.h
index cdcabe92b6e51fcda60ec68cd0ab21ae11cca66f,af74e203b71333c47b898ce7b7a36eb6c4f1608b..efd31d8569c27ca18f2f7a7e599c115c8be9251a
--- 1/cache.h
--- 2/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];

diff --cc config.c
Simple merge