Skip to content

Commit

Permalink
t5000: simplify tar-tree tests
Browse files Browse the repository at this point in the history
Just compare the archives created by git tar-tree with the ones created
using git archive with the equivalent options, whose contents are
checked already, instead of extracting them again.

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
René Scharfe authored and Junio C Hamano committed May 20, 2013
1 parent 03d9bc5 commit 0a00ee5
Showing 1 changed file with 8 additions and 23 deletions.
31 changes: 8 additions & 23 deletions t/t5000-tar-tree.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,6 @@ test_expect_success 'git-archive --prefix=olde-' '

check_tar with_olde-prefix olde-

test_expect_success \
'git tar-tree' \
'git tar-tree HEAD >b2.tar'

test_expect_success \
'git archive vs. git tar-tree' \
'test_cmp b.tar b2.tar'

test_expect_success 'git archive on large files' '
test_config core.bigfilethreshold 1 &&
git archive HEAD >b3.tar &&
Expand Down Expand Up @@ -158,22 +150,15 @@ test_expect_success \
'git get-tar-commit-id <b.tar >b.commitid &&
test_cmp .git/$(git symbolic-ref HEAD) b.commitid'

test_expect_success \
'git tar-tree with prefix' \
'git tar-tree HEAD prefix >c.tar'

test_expect_success \
'extract tar archive with prefix' \
'(mkdir c && cd c && "$TAR" xf -) <c.tar'

test_expect_success \
'validate filenames with prefix' \
'(cd c/prefix/a && find .) | sort >c.lst &&
test_cmp a.lst c.lst'
test_expect_success 'git tar-tree' '
git tar-tree HEAD >tar-tree.tar &&
test_cmp b.tar tar-tree.tar
'

test_expect_success \
'validate file contents with prefix' \
'diff -r a c/prefix/a'
test_expect_success 'git tar-tree with prefix' '
git tar-tree HEAD prefix >tar-tree_with_prefix.tar &&
test_cmp with_prefix.tar tar-tree_with_prefix.tar
'

test_expect_success 'git archive with --output, override inferred format' '
git archive --format=tar --output=d4.zip HEAD &&
Expand Down

0 comments on commit 0a00ee5

Please sign in to comment.