summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-18 04:37:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-18 04:37:14 (GMT)
commita200dc8e62563165df1105eae0e980a44059c6fb (patch)
treeb4133d445668ef81b9f636ee2fc74b141cb6187e /config.c
parent6e97fccf0c77b15c86e25558d69ce54422ebcf92 (diff)
parent6eba6210d9824445c29b75f9c618abbec5184afd (diff)
downloadgit-a200dc8e62563165df1105eae0e980a44059c6fb.zip
git-a200dc8e62563165df1105eae0e980a44059c6fb.tar.gz
git-a200dc8e62563165df1105eae0e980a44059c6fb.tar.bz2
Merge branch 'bc/attr-ignore-case'
* bc/attr-ignore-case: attr.c: respect core.ignorecase when matching attribute patterns attr: read core.attributesfile from git_default_core_config builtin/mv.c: plug miniscule memory leak cleanup: use internal memory allocation wrapper functions everywhere attr.c: avoid inappropriate access to strbuf "buf" member Conflicts: transport-helper.c
Diffstat (limited to 'config.c')
-rw-r--r--config.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/config.c b/config.c
index a9e2359..edf9914 100644
--- a/config.c
+++ b/config.c
@@ -491,6 +491,9 @@ static int git_default_core_config(const char *var, const char *value)
return 0;
}
+ if (!strcmp(var, "core.attributesfile"))
+ return git_config_pathname(&git_attributes_file, var, value);
+
if (!strcmp(var, "core.bare")) {
is_bare_repository_cfg = git_config_bool(var, value);
return 0;