Re: [PATCH 5/5] archive test: test new --fix-attributes feature

From

René Scharfe <rene.scharfe@lsrfire.ath.cx>

Date

Apr 17, 2009, 19:53 UTC

Message-ID

<49E8DE50.5000908@lsrfire.ath.cx>

In-Reply-To

<1239848917-14399-6-git-send-email-gitster@pobox.com>

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>

?

 t/t5001-archive-attr.sh |   46 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/t/t5001-archive-attr.sh b/t/t5001-archive-attr.sh
index b754f21..dd93c3f 100755
--- a/t/t5001-archive-attr.sh
+++ b/t/t5001-archive-attr.sh
@@ -6,6 +6,14 @@ test_description='git archive attribute tests'
 
 SUBSTFORMAT=%H%n
 
+test_expect_exists() {
+	test_expect_success " $1 exists" "test -e $1"
+}
+
+test_expect_missing() {
+	test_expect_success " $1 does not exist" "test ! -e $1"
+}
+
 test_expect_success 'setup' '
 	echo ignored >ignored &&
 	echo ignored export-ignore >>.git/info/attributes &&
@@ -25,7 +33,10 @@ test_expect_success 'setup' '
 	echo "substfile?" export-subst >>.git/info/attributes &&
 	git add nosubstfile substfile1 substfile2 &&
 
-	git commit -m.
+	git commit -m. &&
+
+	git clone --bare . bare &&
+	cp .git/info/attributes bare/info/attributes
 '
 
 test_expect_success 'git archive' '
@@ -33,20 +44,34 @@ test_expect_success 'git archive' '
 	(mkdir archive && cd archive && "$TAR" xf -) <archive.tar
 '
 
+test_expect_missing	archive/ignored
+test_expect_missing	archive/ignored-by-tree
+test_expect_exists	archive/ignored-by-worktree
+
 test_expect_success 'git archive with worktree attributes' '
 	git archive --fix-attributes HEAD >worktree.tar &&
 	(mkdir worktree && cd worktree && "$TAR" xf -) <worktree.tar
 '
 
-test_expect_success 'export-ignore' '
-	test ! -e archive/ignored &&
-	test ! -e archive/ignored-by-tree &&
-	test   -e archive/ignored-by-worktree &&
-	test ! -e worktree/ignored &&
-	test   -e worktree/ignored-by-tree &&
-	test ! -e worktree/ignored-by-worktree
+test_expect_missing	worktree/ignored
+test_expect_exists	worktree/ignored-by-tree
+test_expect_missing	worktree/ignored-by-worktree
+
+test_expect_success 'git archive vs. bare' '
+	(cd bare && git archive HEAD) >bare-archive.tar &&
+	test_cmp archive.tar bare-archive.tar
+'
+
+test_expect_success 'git archive with worktree attributes, bare' '
+	(cd bare && git archive --fix-attributes HEAD) >bare-worktree.tar &&
+	(mkdir bare-worktree && cd bare-worktree && "$TAR" xf -
+	) <bare-worktree.tar
 '
 
+test_expect_missing	bare-worktree/ignored
+test_expect_exists	bare-worktree/ignored-by-tree
+test_expect_exists	bare-worktree/ignored-by-worktree
+
 test_expect_success 'export-subst' '
 	git log "--pretty=format:A${SUBSTFORMAT}O" HEAD >substfile1.expected &&
 	test_cmp nosubstfile archive/nosubstfile &&
@@ -59,4 +84,9 @@ test_expect_success 'git tar-tree vs. git archive with worktree attributes' '
 	test_cmp worktree.tar tar-tree.tar
 '
 
+test_expect_success 'git tar-tree vs. git archive with worktree attrs, bare' '
+	(cd bare && git tar-tree HEAD) >bare-tar-tree.tar &&
+	test_cmp bare-worktree.tar bare-tar-tree.tar
+'
+
 test_done