archive tests: do not use .gitattributes in working directory

We are interested in using archive mostly from a bare repository, so it
should not add .gitattributes to the work tree.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 7641e0dd46cc4f33231817664843787c90a01802..abb41b07ef1985d53c2186617e6b2fcf7e7fe033 100755 (executable)
--- 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 &&
 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' \
 
 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 &&
 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' \
 
 test_expect_success \
     'remove ignored file' \


@@ -139,10 +139,11 @@ test_expect_success \
 
 test_expect_success \
     'create archives with substfiles' \
 
 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 &&
      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' \
 
 test_expect_success \
     'extract substfiles' \