summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-24 09:43:28 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-24 09:43:28 (GMT)
commitcc58fc0684396c5298b21c97f00a568e46224258 (patch)
treeeae57897af7ed7fab38e3ce34328ef4f274fa25e /config.c
parent8a13becc0dd4c8876ebf471bf880446c1a10b7e9 (diff)
parent8565d2d853d85f246faa9bcde91aba3415a24d54 (diff)
downloadgit-cc58fc0684396c5298b21c97f00a568e46224258.zip
git-cc58fc0684396c5298b21c97f00a568e46224258.tar.gz
git-cc58fc0684396c5298b21c97f00a568e46224258.tar.bz2
Merge branch 'js/etc-config'
* js/etc-config: Make tests independent of global config files config: read system-wide defaults from /etc/gitconfig
Diffstat (limited to 'config.c')
-rw-r--r--config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/config.c b/config.c
index 8b6cf1a..0ff413b 100644
--- a/config.c
+++ b/config.c
@@ -394,6 +394,8 @@ int git_config(config_fn_t fn)
* config file otherwise. */
filename = getenv(CONFIG_ENVIRONMENT);
if (!filename) {
+ if (!access(ETC_GITCONFIG, R_OK))
+ ret += git_config_from_file(fn, ETC_GITCONFIG);
home = getenv("HOME");
filename = getenv(CONFIG_LOCAL_ENVIRONMENT);
if (!filename)