Merge branch 'bc/attr-ignore-case'
commita200dc8e62563165df1105eae0e980a44059c6fb
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Oct 2011 04:37:13 +0000 (17 21:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Oct 2011 04:37:14 +0000 (17 21:37 -0700)
treeb4133d445668ef81b9f636ee2fc74b141cb6187e
parent6e97fccf0c77b15c86e25558d69ce54422ebcf92
parent6eba6210d9824445c29b75f9c618abbec5184afd
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
builtin/check-attr.c
cache.h
config.c
environment.c
t/t0003-attributes.sh