diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2009-04-18 00:17:49 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-17 21:05:49 -0700 |
| commit | ad94657fdb8b177b07d94887e1b5259f590f11a8 (patch) | |
| tree | 3e591b4d6385eedcf249018863406605c21b8ddf | |
| parent | 55f0566f6d7269a56751333e0943b50237ce6a85 (diff) | |
| download | git-ad94657fdb8b177b07d94887e1b5259f590f11a8.tar.gz git-ad94657fdb8b177b07d94887e1b5259f590f11a8.tar.xz | |
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>
| -rwxr-xr-x | t/t5000-tar-tree.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 7641e0dd4..abb41b07e 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' \ |