From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Oct 2011 04:37:13 +0000 (-0700)
Subject: Merge branch 'bc/attr-ignore-case'
X-Git-Tag: v1.7.8-rc0~54
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a200dc8e62563165df1105eae0e980a44059c6fb

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
---

a200dc8e62563165df1105eae0e980a44059c6fb
diff --cc t/t0003-attributes.sh
index 46b0736b35,6946c4b82f..dbb2623d93
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@@ -5,9 -5,11 +5,9 @@@ test_description=gitattribute
  . ./test-lib.sh
  
  attr_check () {
 -
 -	path="$1"
 -	expect="$2"
 +	path="$1" expect="$2"
  
- 	git check-attr test -- "$path" >actual 2>err &&
+ 	git $3 check-attr test -- "$path" >actual 2>err &&
  	echo "$path: test: $2" >expect &&
  	test_cmp expect actual &&
  	test_line_count = 0 err
@@@ -82,9 -91,67 +83,65 @@@ test_expect_success 'attribute test' 
  	attr_check no unspecified &&
  	attr_check a/b/d/no "a/b/d/*" &&
  	attr_check a/b/d/yes unspecified
 -
  '
  
+ test_expect_success 'attribute matching is case sensitive when core.ignorecase=0' '
+ 
+ 	test_must_fail attr_check F f "-c core.ignorecase=0" &&
+ 	test_must_fail attr_check a/F f "-c core.ignorecase=0" &&
+ 	test_must_fail attr_check a/c/F f "-c core.ignorecase=0" &&
+ 	test_must_fail attr_check a/G a/g "-c core.ignorecase=0" &&
+ 	test_must_fail attr_check a/B/g a/b/g "-c core.ignorecase=0" &&
+ 	test_must_fail attr_check a/b/G a/b/g "-c core.ignorecase=0" &&
+ 	test_must_fail attr_check a/b/H a/b/h "-c core.ignorecase=0" &&
+ 	test_must_fail attr_check a/b/D/g "a/b/d/*" "-c core.ignorecase=0" &&
+ 	test_must_fail attr_check oNoFf unset "-c core.ignorecase=0" &&
+ 	test_must_fail attr_check oFfOn set "-c core.ignorecase=0" &&
+ 	attr_check NO unspecified "-c core.ignorecase=0" &&
+ 	test_must_fail attr_check a/b/D/NO "a/b/d/*" "-c core.ignorecase=0" &&
+ 	attr_check a/b/d/YES a/b/d/* "-c core.ignorecase=0" &&
+ 	test_must_fail attr_check a/E/f "A/e/F" "-c core.ignorecase=0"
+ 
+ '
+ 
+ test_expect_success 'attribute matching is case insensitive when core.ignorecase=1' '
+ 
+ 	attr_check F f "-c core.ignorecase=1" &&
+ 	attr_check a/F f "-c core.ignorecase=1" &&
+ 	attr_check a/c/F f "-c core.ignorecase=1" &&
+ 	attr_check a/G a/g "-c core.ignorecase=1" &&
+ 	attr_check a/B/g a/b/g "-c core.ignorecase=1" &&
+ 	attr_check a/b/G a/b/g "-c core.ignorecase=1" &&
+ 	attr_check a/b/H a/b/h "-c core.ignorecase=1" &&
+ 	attr_check a/b/D/g "a/b/d/*" "-c core.ignorecase=1" &&
+ 	attr_check oNoFf unset "-c core.ignorecase=1" &&
+ 	attr_check oFfOn set "-c core.ignorecase=1" &&
+ 	attr_check NO unspecified "-c core.ignorecase=1" &&
+ 	attr_check a/b/D/NO "a/b/d/*" "-c core.ignorecase=1" &&
+ 	attr_check a/b/d/YES unspecified "-c core.ignorecase=1" &&
+ 	attr_check a/E/f "A/e/F" "-c core.ignorecase=1"
+ 
+ '
+ 
+ test_expect_success 'check whether FS is case-insensitive' '
+ 	mkdir junk &&
+ 	echo good >junk/CamelCase &&
+ 	echo bad >junk/camelcase &&
+ 	if test "$(cat junk/CamelCase)" != good
+ 	then
+ 		test_set_prereq CASE_INSENSITIVE_FS
+ 	fi
+ '
+ 
+ test_expect_success CASE_INSENSITIVE_FS 'additional case insensitivity tests' '
+ 	test_must_fail attr_check a/B/D/g "a/b/d/*" "-c core.ignorecase=0" &&
+ 	test_must_fail attr_check A/B/D/NO "a/b/d/*" "-c core.ignorecase=0" &&
+ 	attr_check A/b/h a/b/h "-c core.ignorecase=1" &&
+ 	attr_check a/B/D/g "a/b/d/*" "-c core.ignorecase=1" &&
+ 	attr_check A/B/D/NO "a/b/d/*" "-c core.ignorecase=1"
+ '
+ 
  test_expect_success 'unnormalized paths' '
 -
  	attr_check ./f f &&
  	attr_check ./a/g a/g &&
  	attr_check a/./g a/g &&