2005-06-02 22:50:17 +02:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (C) 2005 Rene Scharfe
|
|
|
|
#
|
|
|
|
|
2013-11-10 16:47:29 +01:00
|
|
|
test_description='git archive and git get-tar-commit-id test
|
2005-06-02 22:50:17 +02:00
|
|
|
|
2005-06-03 18:21:23 +02:00
|
|
|
This test covers the topics of file contents, commit date handling and
|
|
|
|
commit id embedding:
|
2005-06-02 22:50:17 +02:00
|
|
|
|
|
|
|
The contents of the repository is compared to the extracted tar
|
|
|
|
archive. The repository contains simple text files, symlinks and a
|
2007-02-04 05:49:16 +01:00
|
|
|
binary file (/bin/sh). Only paths shorter than 99 characters are
|
2005-06-03 18:21:23 +02:00
|
|
|
used.
|
2005-06-02 22:50:17 +02:00
|
|
|
|
2013-11-10 16:47:29 +01:00
|
|
|
git archive applies the commit date to every file in the archive it
|
2005-06-02 22:50:17 +02:00
|
|
|
creates. The test sets the commit date to a specific value and checks
|
|
|
|
if the tar archive contains that value.
|
|
|
|
|
2013-11-10 16:47:29 +01:00
|
|
|
When giving git archive a commit id (in contrast to a tree id) it
|
2005-06-02 22:50:17 +02:00
|
|
|
embeds this commit id into the tar archive as a comment. The test
|
2007-07-03 07:52:14 +02:00
|
|
|
checks the ability of git get-tar-commit-id to figure it out from the
|
2005-06-02 22:50:17 +02:00
|
|
|
tar file.
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2007-09-06 18:51:11 +02:00
|
|
|
SUBSTFORMAT=%H%n
|
2007-09-03 20:07:01 +02:00
|
|
|
|
2013-05-20 11:58:29 +02:00
|
|
|
test_lazy_prereq TAR_NEEDS_PAX_FALLBACK '
|
|
|
|
(
|
|
|
|
mkdir pax &&
|
|
|
|
cd pax &&
|
|
|
|
"$TAR" xf "$TEST_DIRECTORY"/t5000/pax.tar &&
|
|
|
|
test -f PaxHeaders.1791/file
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
t5000: simplify gzip prerequisite checks
In t5000, we test the built-in ".tar.gz" config for
git-archive. To make our tests portable, we check that we
have a way to both gzip and gunzip, and we respected
environment variables to point to alternate commands for
doing these operations.
However, the $GZIP variable did not actually do anything, as
changing it would not affect the baked-in value in
archive-tar.c. Moreover, setting the variable $GZIP
influences gzip itself. From the gzip man page:
The environment variable GZIP can hold a set of default
options for gzip. These options are interpreted first and
can be overwritten by explicit command line parameters.
We could rename this variable, and use it to set up custom
config (or even have a Makefile knob to affect the built
binary), but it is not worth the trouble; nobody has ever
reported a problem with the baked-in default, and they can
always change it via config if they need to. Let's just drop
the variable and use "gzip" in the test (keeping the
prerequisite, of course).
While we're at it, we can drop the GUNZIP variable and
prerequisite; it uses "gzip -d", so if we have GZIP, we
will have both.
We can also use test_lazy_prereq for the gzip prerequisite,
which is simpler and behaves more consistently with the rest
of git (e.g., by making output available when the test is
run with "-v").
Noticed-by: Christian Hesse <mail@eworm.de>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-03 14:21:40 +01:00
|
|
|
test_lazy_prereq GZIP 'gzip --version'
|
|
|
|
|
2013-05-20 11:58:29 +02:00
|
|
|
get_pax_header() {
|
|
|
|
file=$1
|
|
|
|
header=$2=
|
|
|
|
|
|
|
|
while read len rest
|
|
|
|
do
|
|
|
|
if test "$len" = $(echo "$len $rest" | wc -c)
|
|
|
|
then
|
|
|
|
case "$rest" in
|
|
|
|
$header*)
|
|
|
|
echo "${rest#$header}"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
done <"$file"
|
|
|
|
}
|
|
|
|
|
2013-05-20 11:58:26 +02:00
|
|
|
check_tar() {
|
|
|
|
tarfile=$1.tar
|
|
|
|
listfile=$1.lst
|
|
|
|
dir=$1
|
|
|
|
dir_with_prefix=$dir/$2
|
|
|
|
|
|
|
|
test_expect_success ' extract tar archive' '
|
|
|
|
(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
|
|
|
|
'
|
|
|
|
|
2013-05-20 11:58:29 +02:00
|
|
|
test_expect_success TAR_NEEDS_PAX_FALLBACK ' interpret pax headers' '
|
|
|
|
(
|
|
|
|
cd $dir &&
|
|
|
|
for header in *.paxheader
|
|
|
|
do
|
|
|
|
data=${header%.paxheader}.data &&
|
|
|
|
if test -h $data -o -e $data
|
|
|
|
then
|
|
|
|
path=$(get_pax_header $header path) &&
|
|
|
|
if test -n "$path"
|
|
|
|
then
|
|
|
|
mv "$data" "$path"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2013-05-20 11:58:26 +02:00
|
|
|
test_expect_success ' validate filenames' '
|
|
|
|
(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
|
|
|
|
test_cmp a.lst $listfile
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success ' validate file contents' '
|
|
|
|
diff -r a ${dir_with_prefix}a
|
|
|
|
'
|
|
|
|
}
|
|
|
|
|
2005-06-02 22:50:17 +02:00
|
|
|
test_expect_success \
|
|
|
|
'populate workdir' \
|
2013-05-20 11:58:25 +02:00
|
|
|
'mkdir a &&
|
2005-06-02 22:50:17 +02:00
|
|
|
echo simple textfile >a/a &&
|
2013-05-20 11:58:29 +02:00
|
|
|
ten=0123456789 && hundred=$ten$ten$ten$ten$ten$ten$ten$ten$ten$ten &&
|
|
|
|
echo long filename >a/four$hundred &&
|
2005-06-02 22:50:17 +02:00
|
|
|
mkdir a/bin &&
|
2005-06-03 18:21:23 +02:00
|
|
|
cp /bin/sh a/bin &&
|
2007-09-14 00:13:06 +02:00
|
|
|
printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
|
|
|
|
printf "A not substituted O" >a/substfile2 &&
|
2009-03-04 22:38:24 +01:00
|
|
|
if test_have_prereq SYMLINKS; then
|
|
|
|
ln -s a a/l1
|
|
|
|
else
|
|
|
|
printf %s a > a/l1
|
|
|
|
fi &&
|
2006-03-25 23:21:07 +01:00
|
|
|
(p=long_path_to_a_file && cd a &&
|
|
|
|
for depth in 1 2 3 4 5; do mkdir $p && cd $p; done &&
|
|
|
|
echo text >file_with_long_path) &&
|
2005-06-02 22:50:17 +02:00
|
|
|
(cd a && find .) | sort >a.lst'
|
|
|
|
|
2008-06-08 18:42:33 +02:00
|
|
|
test_expect_success \
|
|
|
|
'add ignored file' \
|
|
|
|
'echo ignore me >a/ignored &&
|
2009-04-18 00:17:49 +02:00
|
|
|
echo ignored export-ignore >.git/info/attributes'
|
2008-06-08 18:42:33 +02:00
|
|
|
|
2005-06-02 22:50:17 +02:00
|
|
|
test_expect_success \
|
|
|
|
'add files to repository' \
|
2007-07-03 07:52:14 +02:00
|
|
|
'find a -type f | xargs git update-index --add &&
|
|
|
|
find a -type l | xargs git update-index --add &&
|
|
|
|
treeid=`git write-tree` &&
|
2005-06-02 22:50:17 +02:00
|
|
|
echo $treeid >treeid &&
|
2007-07-03 07:52:14 +02:00
|
|
|
git update-ref HEAD $(TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \
|
|
|
|
git commit-tree $treeid </dev/null)'
|
2005-06-02 22:50:17 +02:00
|
|
|
|
2013-05-20 11:58:24 +02:00
|
|
|
test_expect_success 'setup export-subst' '
|
|
|
|
echo "substfile?" export-subst >>.git/info/attributes &&
|
|
|
|
git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
|
|
|
|
>a/substfile1
|
|
|
|
'
|
|
|
|
|
2008-10-25 17:38:14 +02:00
|
|
|
test_expect_success \
|
|
|
|
'create bare clone' \
|
|
|
|
'git clone --bare . bare.git &&
|
2009-04-18 00:17:49 +02:00
|
|
|
cp .git/info/attributes bare.git/info/attributes'
|
2008-10-25 17:38:14 +02:00
|
|
|
|
2008-06-08 18:42:33 +02:00
|
|
|
test_expect_success \
|
|
|
|
'remove ignored file' \
|
|
|
|
'rm a/ignored'
|
|
|
|
|
2007-04-09 17:12:53 +02:00
|
|
|
test_expect_success \
|
2007-07-03 07:52:14 +02:00
|
|
|
'git archive' \
|
|
|
|
'git archive HEAD >b.tar'
|
2007-04-09 17:12:53 +02:00
|
|
|
|
2013-05-20 11:58:26 +02:00
|
|
|
check_tar b
|
|
|
|
|
2013-05-20 11:58:27 +02:00
|
|
|
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-
|
|
|
|
|
2012-05-03 03:51:04 +02:00
|
|
|
test_expect_success 'git archive on large files' '
|
|
|
|
test_config core.bigfilethreshold 1 &&
|
|
|
|
git archive HEAD >b3.tar &&
|
|
|
|
test_cmp b.tar b3.tar
|
|
|
|
'
|
|
|
|
|
2008-10-25 17:38:14 +02:00
|
|
|
test_expect_success \
|
|
|
|
'git archive in a bare repo' \
|
|
|
|
'(cd bare.git && git archive HEAD) >b3.tar'
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'git archive vs. the same in a bare repo' \
|
|
|
|
'test_cmp b.tar b3.tar'
|
|
|
|
|
2009-02-16 18:20:25 +01:00
|
|
|
test_expect_success 'git archive with --output' \
|
|
|
|
'git archive --output=b4.tar HEAD &&
|
|
|
|
test_cmp b.tar b4.tar'
|
|
|
|
|
2011-11-19 08:40:04 +01:00
|
|
|
test_expect_success 'git archive --remote' \
|
2009-06-27 20:47:43 +02:00
|
|
|
'git archive --remote=. HEAD >b5.tar &&
|
|
|
|
test_cmp b.tar b5.tar'
|
|
|
|
|
2005-06-02 22:50:17 +02:00
|
|
|
test_expect_success \
|
|
|
|
'validate file modification time' \
|
2008-05-13 10:45:32 +02:00
|
|
|
'mkdir extract &&
|
2008-07-25 21:35:10 +02:00
|
|
|
"$TAR" xf b.tar -C extract a/a &&
|
2008-10-30 11:20:27 +01:00
|
|
|
test-chmtime -v +0 extract/a/a |cut -f 1 >b.mtime &&
|
2008-05-13 10:45:32 +02:00
|
|
|
echo "1117231200" >expected.mtime &&
|
2009-03-16 21:18:42 +01:00
|
|
|
test_cmp expected.mtime b.mtime'
|
2005-06-02 22:50:17 +02:00
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 07:52:14 +02:00
|
|
|
'git get-tar-commit-id' \
|
|
|
|
'git get-tar-commit-id <b.tar >b.commitid &&
|
2009-03-16 21:18:42 +01:00
|
|
|
test_cmp .git/$(git symbolic-ref HEAD) b.commitid'
|
2005-06-02 22:50:17 +02:00
|
|
|
|
2010-02-08 00:30:20 +01:00
|
|
|
test_expect_success 'git archive with --output, override inferred format' '
|
|
|
|
git archive --format=tar --output=d4.zip HEAD &&
|
|
|
|
test_cmp b.tar d4.zip
|
|
|
|
'
|
|
|
|
|
2007-04-05 22:55:43 +02:00
|
|
|
test_expect_success \
|
2007-07-03 07:52:14 +02:00
|
|
|
'git archive --list outside of a git repo' \
|
|
|
|
'GIT_DIR=some/non-existing/directory git archive --list'
|
2007-04-05 22:55:43 +02:00
|
|
|
|
archive: don't let remote clients get unreachable commits
Usually git is careful not to allow clients to fetch
arbitrary objects from the database; for example, objects
received via upload-pack must be reachable from a ref.
Upload-archive breaks this by feeding the client's tree-ish
directly to get_sha1, which will accept arbitrary hex sha1s,
reflogs, etc.
This is not a problem if all of your objects are publicly
reachable anyway (or at least public to anybody who can run
upload-archive). Or if you are making the repo available by
dumb protocols like http or rsync (in which case the client
can read your whole object db directly).
But for sites which allow access only through smart
protocols, clients may be able to fetch trees from commits
that exist in the server's object database but are not
referenced (e.g., because history was rewound).
This patch tightens upload-archive's lookup to use dwim_ref
rather than get_sha1. This means a remote client can only
fetch the tip of a named ref, not an arbitrary sha1 or
reflog entry.
This also restricts some legitimate requests, too:
1. Reachable non-tip commits, like:
git archive --remote=$url v1.0~5
2. Sub-trees of reachable commits, like:
git archive --remote=$url v1.7.7:Documentation
Local requests continue to use get_sha1, and are not
restricted at all.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-11-18 00:04:22 +01:00
|
|
|
test_expect_success 'clients cannot access unreachable commits' '
|
|
|
|
test_commit unreachable &&
|
|
|
|
sha1=`git rev-parse HEAD` &&
|
|
|
|
git reset --hard HEAD^ &&
|
|
|
|
git archive $sha1 >remote.tar &&
|
|
|
|
test_must_fail git archive --remote=. $sha1 >remote.tar
|
|
|
|
'
|
|
|
|
|
add uploadarchive.allowUnreachable option
In commit ee27ca4, we started restricting remote git-archive
invocations to only accessing reachable commits. This
matches what upload-pack allows, but does restrict some
useful cases (e.g., HEAD:foo). We loosened this in 0f544ee,
which allows `foo:bar` as long as `foo` is a ref tip.
However, that still doesn't allow many useful things, like:
1. Commits accessible from a ref, like `foo^:bar`, which
are reachable
2. Arbitrary sha1s, even if they are reachable.
We can do a full object-reachability check for these cases,
but it can be quite expensive if the client has sent us the
sha1 of a tree; we have to visit every sub-tree of every
commit in the worst case.
Let's instead give site admins an escape hatch, in case they
prefer the more liberal behavior. For many sites, the full
object database is public anyway (e.g., if you allow dumb
walker access), or the site admin may simply decide the
security/convenience tradeoff is not worth it.
This patch adds a new config option to disable the
restrictions added in ee27ca4. It defaults to off, meaning
there is no change in behavior by default.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-02-28 11:04:19 +01:00
|
|
|
test_expect_success 'upload-archive can allow unreachable commits' '
|
|
|
|
test_commit unreachable1 &&
|
|
|
|
sha1=`git rev-parse HEAD` &&
|
|
|
|
git reset --hard HEAD^ &&
|
|
|
|
git archive $sha1 >remote.tar &&
|
|
|
|
test_config uploadarchive.allowUnreachable true &&
|
|
|
|
git archive --remote=. $sha1 >remote.tar
|
|
|
|
'
|
|
|
|
|
2011-06-22 03:26:31 +02:00
|
|
|
test_expect_success 'setup tar filters' '
|
|
|
|
git config tar.tar.foo.command "tr ab ba" &&
|
2011-06-22 05:17:35 +02:00
|
|
|
git config tar.bar.command "tr ab ba" &&
|
2013-01-23 07:23:27 +01:00
|
|
|
git config tar.bar.remote true &&
|
|
|
|
git config tar.invalid baz
|
2011-06-22 03:26:31 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'archive --list mentions user filter' '
|
|
|
|
git archive --list >output &&
|
|
|
|
grep "^tar\.foo\$" output &&
|
|
|
|
grep "^bar\$" output
|
|
|
|
'
|
|
|
|
|
2011-11-19 08:40:04 +01:00
|
|
|
test_expect_success 'archive --list shows only enabled remote filters' '
|
2011-06-22 03:26:31 +02:00
|
|
|
git archive --list --remote=. >output &&
|
2011-06-22 05:17:35 +02:00
|
|
|
! grep "^tar\.foo\$" output &&
|
2011-06-22 03:26:31 +02:00
|
|
|
grep "^bar\$" output
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'invoke tar filter by format' '
|
|
|
|
git archive --format=tar.foo HEAD >config.tar.foo &&
|
|
|
|
tr ab ba <config.tar.foo >config.tar &&
|
|
|
|
test_cmp b.tar config.tar &&
|
|
|
|
git archive --format=bar HEAD >config.bar &&
|
|
|
|
tr ab ba <config.bar >config.tar &&
|
|
|
|
test_cmp b.tar config.tar
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'invoke tar filter by extension' '
|
|
|
|
git archive -o config-implicit.tar.foo HEAD &&
|
|
|
|
test_cmp config.tar.foo config-implicit.tar.foo &&
|
|
|
|
git archive -o config-implicit.bar HEAD &&
|
|
|
|
test_cmp config.tar.foo config-implicit.bar
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'default output format remains tar' '
|
|
|
|
git archive -o config-implicit.baz HEAD &&
|
|
|
|
test_cmp b.tar config-implicit.baz
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'extension matching requires dot' '
|
|
|
|
git archive -o config-implicittar.foo HEAD &&
|
|
|
|
test_cmp b.tar config-implicittar.foo
|
|
|
|
'
|
|
|
|
|
2011-11-19 08:40:04 +01:00
|
|
|
test_expect_success 'only enabled filters are available remotely' '
|
2011-06-22 05:17:35 +02:00
|
|
|
test_must_fail git archive --remote=. --format=tar.foo HEAD \
|
|
|
|
>remote.tar.foo &&
|
|
|
|
git archive --remote=. --format=bar >remote.bar HEAD &&
|
|
|
|
test_cmp remote.bar config.bar
|
|
|
|
'
|
|
|
|
|
2011-06-22 03:27:35 +02:00
|
|
|
test_expect_success GZIP 'git archive --format=tgz' '
|
|
|
|
git archive --format=tgz HEAD >j.tgz
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success GZIP 'git archive --format=tar.gz' '
|
|
|
|
git archive --format=tar.gz HEAD >j1.tar.gz &&
|
|
|
|
test_cmp j.tgz j1.tar.gz
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success GZIP 'infer tgz from .tgz filename' '
|
|
|
|
git archive --output=j2.tgz HEAD &&
|
|
|
|
test_cmp j.tgz j2.tgz
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success GZIP 'infer tgz from .tar.gz filename' '
|
|
|
|
git archive --output=j3.tar.gz HEAD &&
|
|
|
|
test_cmp j.tgz j3.tar.gz
|
|
|
|
'
|
|
|
|
|
t5000: simplify gzip prerequisite checks
In t5000, we test the built-in ".tar.gz" config for
git-archive. To make our tests portable, we check that we
have a way to both gzip and gunzip, and we respected
environment variables to point to alternate commands for
doing these operations.
However, the $GZIP variable did not actually do anything, as
changing it would not affect the baked-in value in
archive-tar.c. Moreover, setting the variable $GZIP
influences gzip itself. From the gzip man page:
The environment variable GZIP can hold a set of default
options for gzip. These options are interpreted first and
can be overwritten by explicit command line parameters.
We could rename this variable, and use it to set up custom
config (or even have a Makefile knob to affect the built
binary), but it is not worth the trouble; nobody has ever
reported a problem with the baked-in default, and they can
always change it via config if they need to. Let's just drop
the variable and use "gzip" in the test (keeping the
prerequisite, of course).
While we're at it, we can drop the GUNZIP variable and
prerequisite; it uses "gzip -d", so if we have GZIP, we
will have both.
We can also use test_lazy_prereq for the gzip prerequisite,
which is simpler and behaves more consistently with the rest
of git (e.g., by making output available when the test is
run with "-v").
Noticed-by: Christian Hesse <mail@eworm.de>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-03 14:21:40 +01:00
|
|
|
test_expect_success GZIP 'extract tgz file' '
|
|
|
|
gzip -d -c <j.tgz >j.tar &&
|
2011-06-22 03:27:35 +02:00
|
|
|
test_cmp b.tar j.tar
|
|
|
|
'
|
|
|
|
|
2011-11-19 08:40:04 +01:00
|
|
|
test_expect_success GZIP 'remote tar.gz is allowed by default' '
|
2011-06-22 05:17:35 +02:00
|
|
|
git archive --remote=. --format=tar.gz HEAD >remote.tar.gz &&
|
|
|
|
test_cmp j.tgz remote.tar.gz
|
|
|
|
'
|
|
|
|
|
2011-11-19 08:40:04 +01:00
|
|
|
test_expect_success GZIP 'remote tar.gz can be disabled' '
|
2011-06-22 05:17:35 +02:00
|
|
|
git config tar.tar.gz.remote false &&
|
|
|
|
test_must_fail git archive --remote=. --format=tar.gz HEAD \
|
|
|
|
>remote.tar.gz
|
|
|
|
'
|
|
|
|
|
2005-06-02 22:50:17 +02:00
|
|
|
test_done
|