Skip to content

Commit

Permalink
t5000: use check_tar for prefix test
Browse files Browse the repository at this point in the history
Perform the full range of checks against all archived files instead of
looking only at the file type of a few of them.  Also add a test of a
git archive with a prefix ending in with a slash, i.e. adding a full
directory level.

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 deb9c8e commit 03d9bc5
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions t/t5000-tar-tree.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,18 @@ test_expect_success \

check_tar b

test_expect_success 'git archive --prefix=prefix/' '
git archive --prefix=prefix/ HEAD >with_prefix.tar
'

check_tar with_prefix prefix/

test_expect_success 'git-archive --prefix=olde-' '
git archive --prefix=olde- HEAD >with_olde-prefix.tar
'

check_tar with_olde-prefix olde-

test_expect_success \
'git tar-tree' \
'git tar-tree HEAD >b2.tar'
Expand Down Expand Up @@ -180,18 +192,6 @@ test_expect_success 'clients cannot access unreachable commits' '
test_must_fail git archive --remote=. $sha1 >remote.tar
'

test_expect_success 'git-archive --prefix=olde-' '
git archive --prefix=olde- >h.tar HEAD &&
(
mkdir h &&
cd h &&
"$TAR" xf - <../h.tar
) &&
test -d h/olde-a &&
test -d h/olde-a/bin &&
test -f h/olde-a/bin/sh
'

test_expect_success 'setup tar filters' '
git config tar.tar.foo.command "tr ab ba" &&
git config tar.bar.command "tr ab ba" &&
Expand Down

0 comments on commit 03d9bc5

Please sign in to comment.