diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-17 21:37:13 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-17 21:37:14 -0700 |
commit | a200dc8e62563165df1105eae0e980a44059c6fb (patch) | |
tree | b4133d445668ef81b9f636ee2fc74b141cb6187e /builtin/check-attr.c | |
parent | 6e97fccf0c77b15c86e25558d69ce54422ebcf92 (diff) | |
parent | 6eba6210d9824445c29b75f9c618abbec5184afd (diff) | |
download | git-a200dc8e62563165df1105eae0e980a44059c6fb.tar.gz git-a200dc8e62563165df1105eae0e980a44059c6fb.tar.xz |
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 'builtin/check-attr.c')
-rw-r--r-- | builtin/check-attr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/check-attr.c b/builtin/check-attr.c index ded0d836d..44c421eb0 100644 --- a/builtin/check-attr.c +++ b/builtin/check-attr.c @@ -94,6 +94,8 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix) struct git_attr_check *check; int cnt, i, doubledash, filei; + git_config(git_default_config, NULL); + argc = parse_options(argc, argv, prefix, check_attr_options, check_attr_usage, PARSE_OPT_KEEP_DASHDASH); |