From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Mar 2014 21:03:03 +0000 (-0700)
Subject: Merge branch 'jc/check-attr-honor-working-tree' into maint
X-Git-Tag: v1.9.1~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a8b31316ef90153f148b685a802195885d5195f4

Merge branch 'jc/check-attr-honor-working-tree' into maint

"git check-attr" when working on a repository with a working tree
did not work well when the working tree was specified via the
--work-tree (and obviously with --git-dir) option.

* jc/check-attr-honor-working-tree:
check-attr: move to the top of working tree when in non-bare repository
t0003: do not chdir the whole test process
---

a8b31316ef90153f148b685a802195885d5195f4
diff --cc t/t0003-attributes.sh
index b9d79476e2,6e6aef5988..f0fbb42554
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@@ -195,57 -196,18 +195,66 @@@ test_expect_success 'root subdir attrib
  	attr_check subdir/a/i unspecified
  '
  
 +test_expect_success 'negative patterns' '
 +	echo "!f test=bar" >.gitattributes &&
 +	git check-attr test -- '"'"'!f'"'"' 2>errors &&
 +	test_i18ngrep "Negative patterns are ignored" errors
 +'
 +
 +test_expect_success 'patterns starting with exclamation' '
 +	echo "\!f test=foo" >.gitattributes &&
 +	attr_check "!f" foo
 +'
 +
 +test_expect_success '"**" test' '
 +	echo "**/f foo=bar" >.gitattributes &&
 +	cat <<\EOF >expect &&
 +f: foo: bar
 +a/f: foo: bar
 +a/b/f: foo: bar
 +a/b/c/f: foo: bar
 +EOF
 +	git check-attr foo -- "f" >actual 2>err &&
 +	git check-attr foo -- "a/f" >>actual 2>>err &&
 +	git check-attr foo -- "a/b/f" >>actual 2>>err &&
 +	git check-attr foo -- "a/b/c/f" >>actual 2>>err &&
 +	test_cmp expect actual &&
 +	test_line_count = 0 err
 +'
 +
 +test_expect_success '"**" with no slashes test' '
 +	echo "a**f foo=bar" >.gitattributes &&
 +	git check-attr foo -- "f" >actual &&
 +	cat <<\EOF >expect &&
 +f: foo: unspecified
 +af: foo: bar
 +axf: foo: bar
 +a/f: foo: unspecified
 +a/b/f: foo: unspecified
 +a/b/c/f: foo: unspecified
 +EOF
 +	git check-attr foo -- "f" >actual 2>err &&
 +	git check-attr foo -- "af" >>actual 2>err &&
 +	git check-attr foo -- "axf" >>actual 2>err &&
 +	git check-attr foo -- "a/f" >>actual 2>>err &&
 +	git check-attr foo -- "a/b/f" >>actual 2>>err &&
 +	git check-attr foo -- "a/b/c/f" >>actual 2>>err &&
 +	test_cmp expect actual &&
 +	test_line_count = 0 err
 +'
 +
+ test_expect_success 'using --git-dir and --work-tree' '
+ 	mkdir unreal real &&
+ 	git init real &&
+ 	echo "file test=in-real" >real/.gitattributes &&
+ 	(
+ 		cd unreal &&
+ 		attr_check file in-real "--git-dir ../real/.git --work-tree ../real"
+ 	)
+ '
+ 
  test_expect_success 'setup bare' '
- 	git clone --bare . bare.git &&
- 	cd bare.git
+ 	git clone --bare . bare.git
  '
  
  test_expect_success 'bare repository: check that .gitattribute is ignored' '