Re: [PATCH v2 3/3] archive: do not read .gitattributes in working directory

From: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Apr 13, 2009, 10:41 UTC
Message-ID: <49E316CD.7030001@lsrfire.ath.cx>
In-Reply-To: <fcaeb9bf0904090353s4ec770bfk3cd3f6559c367a20@mail.gmail.com>

Nguyen Thai Ngoc Duy schrieb:

Show 7 quoted lines

> 2009/4/9 Junio C Hamano <gitster@pobox.com>:
>> It would affect a bit more tests, but I think you would want to test both
>> the new "normal" mode of operation (generate archives with "git archive"
>> and "git tar-tree" without options and compare, for example), instead of
>> adding --fix-attributes everywhere.
> 
> There is a new test to test the new "normal" mode. I'll think of more.

The following patch, which can be applied before yours, makes the tests still pass after your changes by avoiding to use worktree attributes. I think it makes sense to create a separate script for the new tests and eventually move the existing archive attribute tests there.

diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 7641e0d..abb41b0 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -50,7 +50,7 @@ test_expect_success \
 test_expect_success \
     'add ignored file' \
     'echo ignore me >a/ignored &&
-     echo ignored export-ignore >.gitattributes'
+     echo ignored export-ignore >.git/info/attributes'
 
 test_expect_success \
     'add files to repository' \
@@ -64,7 +64,7 @@ test_expect_success \
 test_expect_success \
     'create bare clone' \
     'git clone --bare . bare.git &&
-     cp .gitattributes bare.git/info/attributes'
+     cp .git/info/attributes bare.git/info/attributes'
 
 test_expect_success \
     'remove ignored file' \
@@ -139,10 +139,11 @@ test_expect_success \
 
 test_expect_success \
     'create archives with substfiles' \
-    'echo "substfile?" export-subst >a/.gitattributes &&
+    'cp .git/info/attributes .git/info/attributes.before &&
+     echo "substfile?" export-subst >>.git/info/attributes &&
      git archive HEAD >f.tar &&
      git archive --prefix=prefix/ HEAD >g.tar &&
-     rm a/.gitattributes'
+     mv .git/info/attributes.before .git/info/attributes'
 
 test_expect_success \
     'extract substfiles' \