From b2b3e9c2d623359ed680a5eef850ef2fd313b73c Mon Sep 17 00:00:00 2001 From: Jay Soffian Date: Thu, 22 Sep 2011 17:44:20 -0400 Subject: Teach '--cached' option to check-attr This option causes check-attr to consider .gitattributes only from the index, ignoring .gitattributes from the working tree. This allows the command to be used in situations where a working tree does not exist. Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano --- t/t0003-attributes.sh | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 't/t0003-attributes.sh') diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh index ae2f1da28f..c0a45630be 100755 --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@ -134,10 +134,20 @@ test_expect_success 'attribute test: read paths from stdin' ' test_expect_success 'attribute test: --all option' ' - grep -v unspecified < expect-all | sort > expect && - sed -e "s/:.*//" < expect-all | uniq | - git check-attr --stdin --all | sort > actual && - test_cmp expect actual + grep -v unspecified specified-all && + sed -e "s/:.*//" stdin-all && + git check-attr --stdin --all actual && + test_cmp specified-all actual +' + +test_expect_success 'attribute test: --cached option' ' + + : >empty && + git check-attr --cached --stdin --all actual && + test_cmp empty actual && + git add .gitattributes a/.gitattributes a/b/.gitattributes && + git check-attr --cached --stdin --all actual && + test_cmp specified-all actual ' test_expect_success 'root subdir attribute test' ' @@ -168,6 +178,13 @@ test_expect_success 'bare repository: check that .gitattribute is ignored' ' ' +test_expect_success 'bare repository: check that --cached honors index' ' + GIT_INDEX_FILE=../.git/index \ + git check-attr --cached --stdin --all <../stdin-all | + sort >actual && + test_cmp ../specified-all actual +' + test_expect_success 'bare repository: test info/attributes' ' ( -- cgit v1.2.1