mirror of
https://github.com/git/git.git
synced 2024-11-27 12:03:55 +08:00
785a042981
This is fewer lines of code, but more importantly, fixes a
bogus pointer offset. We are looking for "tar." in the
section, but later assume that the dot we found is at offset
9, not 3. This is a holdover from an earlier iteration of
767cf45 which called the section "tarfilter".
As a result, we could erroneously reject some filters with
dots in their name, as well as read uninitialized memory.
Reported by (and test by) René Scharfe.
Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
312 lines
8.5 KiB
Bash
Executable File
312 lines
8.5 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (C) 2005 Rene Scharfe
|
|
#
|
|
|
|
test_description='git tar-tree and git get-tar-commit-id test
|
|
|
|
This test covers the topics of file contents, commit date handling and
|
|
commit id embedding:
|
|
|
|
The contents of the repository is compared to the extracted tar
|
|
archive. The repository contains simple text files, symlinks and a
|
|
binary file (/bin/sh). Only paths shorter than 99 characters are
|
|
used.
|
|
|
|
git tar-tree applies the commit date to every file in the archive it
|
|
creates. The test sets the commit date to a specific value and checks
|
|
if the tar archive contains that value.
|
|
|
|
When giving git tar-tree a commit id (in contrast to a tree id) it
|
|
embeds this commit id into the tar archive as a comment. The test
|
|
checks the ability of git get-tar-commit-id to figure it out from the
|
|
tar file.
|
|
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
GZIP=${GZIP:-gzip}
|
|
GUNZIP=${GUNZIP:-gzip -d}
|
|
|
|
SUBSTFORMAT=%H%n
|
|
|
|
test_expect_success \
|
|
'populate workdir' \
|
|
'mkdir a b c &&
|
|
echo simple textfile >a/a &&
|
|
mkdir a/bin &&
|
|
cp /bin/sh a/bin &&
|
|
printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
|
|
printf "A not substituted O" >a/substfile2 &&
|
|
if test_have_prereq SYMLINKS; then
|
|
ln -s a a/l1
|
|
else
|
|
printf %s a > a/l1
|
|
fi &&
|
|
(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) &&
|
|
(cd a && find .) | sort >a.lst'
|
|
|
|
test_expect_success \
|
|
'add ignored file' \
|
|
'echo ignore me >a/ignored &&
|
|
echo ignored export-ignore >.git/info/attributes'
|
|
|
|
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 &&
|
|
treeid=`git write-tree` &&
|
|
echo $treeid >treeid &&
|
|
git update-ref HEAD $(TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \
|
|
git commit-tree $treeid </dev/null)'
|
|
|
|
test_expect_success \
|
|
'create bare clone' \
|
|
'git clone --bare . bare.git &&
|
|
cp .git/info/attributes bare.git/info/attributes'
|
|
|
|
test_expect_success \
|
|
'remove ignored file' \
|
|
'rm a/ignored'
|
|
|
|
test_expect_success \
|
|
'git archive' \
|
|
'git archive HEAD >b.tar'
|
|
|
|
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 &&
|
|
test_cmp b.tar b3.tar
|
|
'
|
|
|
|
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'
|
|
|
|
test_expect_success 'git archive with --output' \
|
|
'git archive --output=b4.tar HEAD &&
|
|
test_cmp b.tar b4.tar'
|
|
|
|
test_expect_success 'git archive --remote' \
|
|
'git archive --remote=. HEAD >b5.tar &&
|
|
test_cmp b.tar b5.tar'
|
|
|
|
test_expect_success \
|
|
'validate file modification time' \
|
|
'mkdir extract &&
|
|
"$TAR" xf b.tar -C extract a/a &&
|
|
test-chmtime -v +0 extract/a/a |cut -f 1 >b.mtime &&
|
|
echo "1117231200" >expected.mtime &&
|
|
test_cmp expected.mtime b.mtime'
|
|
|
|
test_expect_success \
|
|
'git get-tar-commit-id' \
|
|
'git get-tar-commit-id <b.tar >b.commitid &&
|
|
test_cmp .git/$(git symbolic-ref HEAD) b.commitid'
|
|
|
|
test_expect_success \
|
|
'extract tar archive' \
|
|
'(cd b && "$TAR" xf -) <b.tar'
|
|
|
|
test_expect_success \
|
|
'validate filenames' \
|
|
'(cd b/a && find .) | sort >b.lst &&
|
|
test_cmp a.lst b.lst'
|
|
|
|
test_expect_success \
|
|
'validate file contents' \
|
|
'diff -r a b/a'
|
|
|
|
test_expect_success \
|
|
'git tar-tree with prefix' \
|
|
'git tar-tree HEAD prefix >c.tar'
|
|
|
|
test_expect_success \
|
|
'extract tar archive with prefix' \
|
|
'(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 \
|
|
'validate file contents with prefix' \
|
|
'diff -r a c/prefix/a'
|
|
|
|
test_expect_success \
|
|
'create archives with substfiles' \
|
|
'cp .git/info/attributes .git/info/attributes.before &&
|
|
echo "substfile?" export-subst >>.git/info/attributes &&
|
|
git archive HEAD >f.tar &&
|
|
git archive --prefix=prefix/ HEAD >g.tar &&
|
|
mv .git/info/attributes.before .git/info/attributes'
|
|
|
|
test_expect_success \
|
|
'extract substfiles' \
|
|
'(mkdir f && cd f && "$TAR" xf -) <f.tar'
|
|
|
|
test_expect_success \
|
|
'validate substfile contents' \
|
|
'git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
|
|
>f/a/substfile1.expected &&
|
|
test_cmp f/a/substfile1.expected f/a/substfile1 &&
|
|
test_cmp a/substfile2 f/a/substfile2
|
|
'
|
|
|
|
test_expect_success \
|
|
'extract substfiles from archive with prefix' \
|
|
'(mkdir g && cd g && "$TAR" xf -) <g.tar'
|
|
|
|
test_expect_success \
|
|
'validate substfile contents from archive with prefix' \
|
|
'git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
|
|
>g/prefix/a/substfile1.expected &&
|
|
test_cmp g/prefix/a/substfile1.expected g/prefix/a/substfile1 &&
|
|
test_cmp a/substfile2 g/prefix/a/substfile2
|
|
'
|
|
|
|
test_expect_success 'git archive with --output, override inferred format' '
|
|
git archive --format=tar --output=d4.zip HEAD &&
|
|
test_cmp b.tar d4.zip
|
|
'
|
|
|
|
test_expect_success \
|
|
'git archive --list outside of a git repo' \
|
|
'GIT_DIR=some/non-existing/directory git archive --list'
|
|
|
|
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
|
|
'
|
|
|
|
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" &&
|
|
git config tar.bar.remote true &&
|
|
git config tar.invalid baz
|
|
'
|
|
|
|
test_expect_success 'archive --list mentions user filter' '
|
|
git archive --list >output &&
|
|
grep "^tar\.foo\$" output &&
|
|
grep "^bar\$" output
|
|
'
|
|
|
|
test_expect_success 'archive --list shows only enabled remote filters' '
|
|
git archive --list --remote=. >output &&
|
|
! grep "^tar\.foo\$" output &&
|
|
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
|
|
'
|
|
|
|
test_expect_success 'only enabled filters are available remotely' '
|
|
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
|
|
'
|
|
|
|
if $GZIP --version >/dev/null 2>&1; then
|
|
test_set_prereq GZIP
|
|
else
|
|
say "Skipping some tar.gz tests because gzip not found"
|
|
fi
|
|
|
|
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
|
|
'
|
|
|
|
if $GUNZIP --version >/dev/null 2>&1; then
|
|
test_set_prereq GUNZIP
|
|
else
|
|
say "Skipping some tar.gz tests because gunzip was not found"
|
|
fi
|
|
|
|
test_expect_success GZIP,GUNZIP 'extract tgz file' '
|
|
$GUNZIP -c <j.tgz >j.tar &&
|
|
test_cmp b.tar j.tar
|
|
'
|
|
|
|
test_expect_success GZIP 'remote tar.gz is allowed by default' '
|
|
git archive --remote=. --format=tar.gz HEAD >remote.tar.gz &&
|
|
test_cmp j.tgz remote.tar.gz
|
|
'
|
|
|
|
test_expect_success GZIP 'remote tar.gz can be disabled' '
|
|
git config tar.tar.gz.remote false &&
|
|
test_must_fail git archive --remote=. --format=tar.gz HEAD \
|
|
>remote.tar.gz
|
|
'
|
|
|
|
test_done
|