archive: handle commits with an empty tree
git-archive relies on get_pathspec to convert its argv into
a list of pathspecs. When get_pathspec is given an empty
argv list, it returns a single pathspec, the empty string,
to indicate that everything matches. When we feed this to
our path_exists function, we typically see that the pathspec
turns up at least one item in the tree, and we are happy.
But when our tree is empty, we erroneously think it is
because the pathspec is too limited, when in fact it is
simply that there is nothing to be found in the tree. This
is a weird corner case, but the correct behavior is almost
certainly to produce an empty archive, not to exit with an
error.
This patch teaches git-archive to create empty archives when
there is no pathspec given (we continue to complain if a
pathspec is given, since it obviously is not matched). It
also confirms that the tar and zip writers produce sane
output in this instance.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-11 02:32:32 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='test corner cases of git-archive'
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
test_expect_success 'create commit with empty tree' '
|
|
|
|
|
git commit --allow-empty -m foo
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
# Make a dir and clean it up afterwards
|
|
|
|
|
make_dir() {
|
|
|
|
|
mkdir "$1" &&
|
|
|
|
|
test_when_finished "rm -rf '$1'"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Check that the dir given in "$1" contains exactly the
|
|
|
|
|
# set of paths given as arguments.
|
|
|
|
|
check_dir() {
|
|
|
|
|
dir=$1; shift
|
|
|
|
|
{
|
|
|
|
|
echo "$dir" &&
|
|
|
|
|
for i in "$@"; do
|
|
|
|
|
echo "$dir/$i"
|
|
|
|
|
done
|
|
|
|
|
} | sort >expect &&
|
2013-05-09 15:10:48 +02:00
|
|
|
find "$dir" ! -name pax_global_header -print | sort >actual &&
|
archive: handle commits with an empty tree
git-archive relies on get_pathspec to convert its argv into
a list of pathspecs. When get_pathspec is given an empty
argv list, it returns a single pathspec, the empty string,
to indicate that everything matches. When we feed this to
our path_exists function, we typically see that the pathspec
turns up at least one item in the tree, and we are happy.
But when our tree is empty, we erroneously think it is
because the pathspec is too limited, when in fact it is
simply that there is nothing to be found in the tree. This
is a weird corner case, but the correct behavior is almost
certainly to produce an empty archive, not to exit with an
error.
This patch teaches git-archive to create empty archives when
there is no pathspec given (we continue to complain if a
pathspec is given, since it obviously is not matched). It
also confirms that the tar and zip writers produce sane
output in this instance.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-11 02:32:32 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-30 09:53:52 +02:00
|
|
|
test_lazy_prereq UNZIP_ZIP64_SUPPORT '
|
|
|
|
|
"$GIT_UNZIP" -v | grep ZIP64_SUPPORT
|
|
|
|
|
'
|
2013-06-03 00:48:24 +02:00
|
|
|
|
2013-05-09 15:36:10 +02:00
|
|
|
# bsdtar/libarchive versions before 3.1.3 consider a tar file with a
|
|
|
|
|
# global pax header that is not followed by a file record as corrupt.
|
|
|
|
|
if "$TAR" tf "$TEST_DIRECTORY"/t5004/empty-with-pax-header.tar >/dev/null 2>&1
|
|
|
|
|
then
|
|
|
|
|
test_set_prereq HEADER_ONLY_TAR_OK
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
test_expect_success HEADER_ONLY_TAR_OK 'tar archive of commit with empty tree' '
|
|
|
|
|
git archive --format=tar HEAD >empty-with-pax-header.tar &&
|
|
|
|
|
make_dir extract &&
|
|
|
|
|
"$TAR" xf empty-with-pax-header.tar -C extract &&
|
|
|
|
|
check_dir extract
|
|
|
|
|
'
|
|
|
|
|
|
archive: handle commits with an empty tree
git-archive relies on get_pathspec to convert its argv into
a list of pathspecs. When get_pathspec is given an empty
argv list, it returns a single pathspec, the empty string,
to indicate that everything matches. When we feed this to
our path_exists function, we typically see that the pathspec
turns up at least one item in the tree, and we are happy.
But when our tree is empty, we erroneously think it is
because the pathspec is too limited, when in fact it is
simply that there is nothing to be found in the tree. This
is a weird corner case, but the correct behavior is almost
certainly to produce an empty archive, not to exit with an
error.
This patch teaches git-archive to create empty archives when
there is no pathspec given (we continue to complain if a
pathspec is given, since it obviously is not matched). It
also confirms that the tar and zip writers produce sane
output in this instance.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-11 02:32:32 +01:00
|
|
|
test_expect_success 'tar archive of empty tree is empty' '
|
2013-04-10 19:00:20 +02:00
|
|
|
git archive --format=tar HEAD: >empty.tar &&
|
2013-05-09 15:13:47 +02:00
|
|
|
perl -e "print \"\\0\" x 10240" >10knuls.tar &&
|
2014-06-04 17:57:52 +02:00
|
|
|
test_cmp_bin 10knuls.tar empty.tar
|
archive: handle commits with an empty tree
git-archive relies on get_pathspec to convert its argv into
a list of pathspecs. When get_pathspec is given an empty
argv list, it returns a single pathspec, the empty string,
to indicate that everything matches. When we feed this to
our path_exists function, we typically see that the pathspec
turns up at least one item in the tree, and we are happy.
But when our tree is empty, we erroneously think it is
because the pathspec is too limited, when in fact it is
simply that there is nothing to be found in the tree. This
is a weird corner case, but the correct behavior is almost
certainly to produce an empty archive, not to exit with an
error.
This patch teaches git-archive to create empty archives when
there is no pathspec given (we continue to complain if a
pathspec is given, since it obviously is not matched). It
also confirms that the tar and zip writers produce sane
output in this instance.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-11 02:32:32 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'tar archive of empty tree with prefix' '
|
|
|
|
|
git archive --format=tar --prefix=foo/ HEAD >prefix.tar &&
|
|
|
|
|
make_dir extract &&
|
|
|
|
|
"$TAR" xf prefix.tar -C extract &&
|
|
|
|
|
check_dir extract foo
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success UNZIP 'zip archive of empty tree is empty' '
|
|
|
|
|
# Detect the exit code produced when our particular flavor of unzip
|
|
|
|
|
# sees an empty archive. Infozip will generate a warning and exit with
|
|
|
|
|
# code 1. But in the name of sanity, we do not expect other unzip
|
|
|
|
|
# implementations to do the same thing (it would be perfectly
|
|
|
|
|
# reasonable to exit 0, for example).
|
|
|
|
|
#
|
|
|
|
|
# This makes our test less rigorous on some platforms (unzip may not
|
|
|
|
|
# handle the empty repo at all, making our later check of its exit code
|
|
|
|
|
# a no-op). But we cannot do anything reasonable except skip the test
|
|
|
|
|
# on such platforms anyway, and this is the moral equivalent.
|
2015-03-20 11:12:29 +01:00
|
|
|
{
|
|
|
|
|
"$GIT_UNZIP" "$TEST_DIRECTORY"/t5004/empty.zip
|
|
|
|
|
expect_code=$?
|
|
|
|
|
} &&
|
archive: handle commits with an empty tree
git-archive relies on get_pathspec to convert its argv into
a list of pathspecs. When get_pathspec is given an empty
argv list, it returns a single pathspec, the empty string,
to indicate that everything matches. When we feed this to
our path_exists function, we typically see that the pathspec
turns up at least one item in the tree, and we are happy.
But when our tree is empty, we erroneously think it is
because the pathspec is too limited, when in fact it is
simply that there is nothing to be found in the tree. This
is a weird corner case, but the correct behavior is almost
certainly to produce an empty archive, not to exit with an
error.
This patch teaches git-archive to create empty archives when
there is no pathspec given (we continue to complain if a
pathspec is given, since it obviously is not matched). It
also confirms that the tar and zip writers produce sane
output in this instance.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-11 02:32:32 +01:00
|
|
|
|
|
|
|
|
git archive --format=zip HEAD >empty.zip &&
|
|
|
|
|
make_dir extract &&
|
|
|
|
|
(
|
|
|
|
|
cd extract &&
|
|
|
|
|
test_expect_code $expect_code "$GIT_UNZIP" ../empty.zip
|
|
|
|
|
) &&
|
|
|
|
|
check_dir extract
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success UNZIP 'zip archive of empty tree with prefix' '
|
|
|
|
|
# We do not have to play exit-code tricks here, because our
|
|
|
|
|
# result should not be empty; it has a directory in it.
|
|
|
|
|
git archive --format=zip --prefix=foo/ HEAD >prefix.zip &&
|
|
|
|
|
make_dir extract &&
|
|
|
|
|
(
|
|
|
|
|
cd extract &&
|
|
|
|
|
"$GIT_UNZIP" ../prefix.zip
|
|
|
|
|
) &&
|
|
|
|
|
check_dir extract foo
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'archive complains about pathspec on empty tree' '
|
|
|
|
|
test_must_fail git archive --format=tar HEAD -- foo >/dev/null
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'create a commit with an empty subtree' '
|
|
|
|
|
empty_tree=$(git hash-object -t tree /dev/null) &&
|
|
|
|
|
root_tree=$(printf "040000 tree $empty_tree\tsub\n" | git mktree)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'archive empty subtree with no pathspec' '
|
|
|
|
|
git archive --format=tar $root_tree >subtree-all.tar &&
|
|
|
|
|
make_dir extract &&
|
|
|
|
|
"$TAR" xf subtree-all.tar -C extract &&
|
2017-09-13 00:43:57 +02:00
|
|
|
check_dir extract
|
archive: handle commits with an empty tree
git-archive relies on get_pathspec to convert its argv into
a list of pathspecs. When get_pathspec is given an empty
argv list, it returns a single pathspec, the empty string,
to indicate that everything matches. When we feed this to
our path_exists function, we typically see that the pathspec
turns up at least one item in the tree, and we are happy.
But when our tree is empty, we erroneously think it is
because the pathspec is too limited, when in fact it is
simply that there is nothing to be found in the tree. This
is a weird corner case, but the correct behavior is almost
certainly to produce an empty archive, not to exit with an
error.
This patch teaches git-archive to create empty archives when
there is no pathspec given (we continue to complain if a
pathspec is given, since it obviously is not matched). It
also confirms that the tar and zip writers produce sane
output in this instance.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-11 02:32:32 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'archive empty subtree by direct pathspec' '
|
|
|
|
|
git archive --format=tar $root_tree -- sub >subtree-path.tar &&
|
|
|
|
|
make_dir extract &&
|
|
|
|
|
"$TAR" xf subtree-path.tar -C extract &&
|
2017-09-13 00:43:57 +02:00
|
|
|
check_dir extract
|
archive: handle commits with an empty tree
git-archive relies on get_pathspec to convert its argv into
a list of pathspecs. When get_pathspec is given an empty
argv list, it returns a single pathspec, the empty string,
to indicate that everything matches. When we feed this to
our path_exists function, we typically see that the pathspec
turns up at least one item in the tree, and we are happy.
But when our tree is empty, we erroneously think it is
because the pathspec is too limited, when in fact it is
simply that there is nothing to be found in the tree. This
is a weird corner case, but the correct behavior is almost
certainly to produce an empty archive, not to exit with an
error.
This patch teaches git-archive to create empty archives when
there is no pathspec given (we continue to complain if a
pathspec is given, since it obviously is not matched). It
also confirms that the tar and zip writers produce sane
output in this instance.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-11 02:32:32 +01:00
|
|
|
'
|
|
|
|
|
|
2015-08-22 21:06:12 +02:00
|
|
|
ZIPINFO=zipinfo
|
|
|
|
|
|
|
|
|
|
test_lazy_prereq ZIPINFO '
|
|
|
|
|
n=$("$ZIPINFO" "$TEST_DIRECTORY"/t5004/empty.zip | sed -n "2s/.* //p")
|
|
|
|
|
test "x$n" = "x0"
|
|
|
|
|
'
|
|
|
|
|
|
2015-08-22 21:06:45 +02:00
|
|
|
test_expect_success ZIPINFO 'zip archive with many entries' '
|
2015-08-22 21:06:12 +02:00
|
|
|
# add a directory with 256 files
|
|
|
|
|
mkdir 00 &&
|
|
|
|
|
for a in 0 1 2 3 4 5 6 7 8 9 a b c d e f
|
|
|
|
|
do
|
|
|
|
|
for b in 0 1 2 3 4 5 6 7 8 9 a b c d e f
|
|
|
|
|
do
|
|
|
|
|
: >00/$a$b
|
|
|
|
|
done
|
|
|
|
|
done &&
|
|
|
|
|
git add 00 &&
|
|
|
|
|
git commit -m "256 files in 1 directory" &&
|
|
|
|
|
|
|
|
|
|
# duplicate it to get 65536 files in 256 directories
|
|
|
|
|
subtree=$(git write-tree --prefix=00/) &&
|
|
|
|
|
for c in 0 1 2 3 4 5 6 7 8 9 a b c d e f
|
|
|
|
|
do
|
|
|
|
|
for d in 0 1 2 3 4 5 6 7 8 9 a b c d e f
|
|
|
|
|
do
|
|
|
|
|
echo "040000 tree $subtree $c$d"
|
|
|
|
|
done
|
|
|
|
|
done >tree &&
|
|
|
|
|
tree=$(git mktree <tree) &&
|
|
|
|
|
|
|
|
|
|
# zip them
|
|
|
|
|
git archive -o many.zip $tree &&
|
|
|
|
|
|
|
|
|
|
# check the number of entries in the ZIP file directory
|
|
|
|
|
expr 65536 + 256 >expect &&
|
|
|
|
|
"$ZIPINFO" many.zip | head -2 | sed -n "2s/.* //p" >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2017-04-30 09:53:52 +02:00
|
|
|
test_expect_success EXPENSIVE,UNZIP,UNZIP_ZIP64_SUPPORT \
|
|
|
|
|
'zip archive bigger than 4GB' '
|
2017-04-24 19:29:53 +02:00
|
|
|
# build string containing 65536 characters
|
|
|
|
|
s=0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef &&
|
|
|
|
|
s=$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s &&
|
|
|
|
|
s=$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s &&
|
|
|
|
|
|
|
|
|
|
# create blob with a length of 65536 + 1 bytes
|
|
|
|
|
blob=$(echo $s | git hash-object -w --stdin) &&
|
|
|
|
|
|
|
|
|
|
# create tree containing 65500 entries of that blob
|
|
|
|
|
for i in $(test_seq 1 65500)
|
|
|
|
|
do
|
|
|
|
|
echo "100644 blob $blob $i"
|
|
|
|
|
done >tree &&
|
|
|
|
|
tree=$(git mktree <tree) &&
|
|
|
|
|
|
|
|
|
|
# zip it, creating an archive a bit bigger than 4GB
|
|
|
|
|
git archive -0 -o many-big.zip $tree &&
|
|
|
|
|
|
|
|
|
|
"$GIT_UNZIP" -t many-big.zip 9999 65500 &&
|
|
|
|
|
"$GIT_UNZIP" -t many-big.zip
|
|
|
|
|
'
|
|
|
|
|
|
2017-04-30 09:53:52 +02:00
|
|
|
test_expect_success EXPENSIVE,LONG_IS_64BIT,UNZIP,UNZIP_ZIP64_SUPPORT,ZIPINFO \
|
|
|
|
|
'zip archive with files bigger than 4GB' '
|
2017-04-24 19:29:53 +02:00
|
|
|
# Pack created with:
|
|
|
|
|
# dd if=/dev/zero of=file bs=1M count=4100 && git hash-object -w file
|
|
|
|
|
mkdir -p .git/objects/pack &&
|
|
|
|
|
(
|
|
|
|
|
cd .git/objects/pack &&
|
|
|
|
|
"$GIT_UNZIP" "$TEST_DIRECTORY"/t5004/big-pack.zip
|
|
|
|
|
) &&
|
|
|
|
|
blob=754a93d6fada4c6873360e6cb4b209132271ab0e &&
|
|
|
|
|
size=$(expr 4100 "*" 1024 "*" 1024) &&
|
|
|
|
|
|
|
|
|
|
# create a tree containing the file
|
|
|
|
|
tree=$(echo "100644 blob $blob big-file" | git mktree) &&
|
|
|
|
|
|
|
|
|
|
# zip it, creating an archive with a file bigger than 4GB
|
|
|
|
|
git archive -o big.zip $tree &&
|
|
|
|
|
|
|
|
|
|
"$GIT_UNZIP" -t big.zip &&
|
|
|
|
|
"$ZIPINFO" big.zip >big.lst &&
|
|
|
|
|
grep $size big.lst
|
|
|
|
|
'
|
|
|
|
|
|
archive: handle commits with an empty tree
git-archive relies on get_pathspec to convert its argv into
a list of pathspecs. When get_pathspec is given an empty
argv list, it returns a single pathspec, the empty string,
to indicate that everything matches. When we feed this to
our path_exists function, we typically see that the pathspec
turns up at least one item in the tree, and we are happy.
But when our tree is empty, we erroneously think it is
because the pathspec is too limited, when in fact it is
simply that there is nothing to be found in the tree. This
is a weird corner case, but the correct behavior is almost
certainly to produce an empty archive, not to exit with an
error.
This patch teaches git-archive to create empty archives when
there is no pathspec given (we continue to complain if a
pathspec is given, since it obviously is not matched). It
also confirms that the tar and zip writers produce sane
output in this instance.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-11 02:32:32 +01:00
|
|
|
test_done
|