summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-06-22 14:46:11 -0700
committerJunio C Hamano <gitster@pobox.com>2008-06-22 14:46:11 -0700
commit9523298c95467e014daf5ed108cfcbe75a0d918d (patch)
tree9c60c33033a704ae1321b2919f315309c90fac31 /t
parent159e639e5bf24d78b22802934ae335413b2aa6ae (diff)
parent008d896df5deaa967d4d86306b408333e8ef34c3 (diff)
downloadgit-9523298c95467e014daf5ed108cfcbe75a0d918d.tar.gz
Merge branch 'rs/archive-ignore'
* rs/archive-ignore: Teach new attribute 'export-ignore' to git-archive
Diffstat (limited to 't')
-rwxr-xr-xt/t5000-tar-tree.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 9b0baac8db..3f1e25d921 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -45,6 +45,11 @@ test_expect_success \
(cd a && find .) | sort >a.lst'
test_expect_success \
+ 'add ignored file' \
+ 'echo ignore me >a/ignored &&
+ echo ignored export-ignore >.gitattributes'
+
+test_expect_success \
'add files to repository' \
'find a -type f | xargs git update-index --add &&
find a -type l | xargs git update-index --add &&
@@ -54,6 +59,10 @@ test_expect_success \
git commit-tree $treeid </dev/null)'
test_expect_success \
+ 'remove ignored file' \
+ 'rm a/ignored'
+
+test_expect_success \
'git archive' \
'git archive HEAD >b.tar'