undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/empty-archive' into maint

Browse Source 
* rs/empty-archive:
  t5004: resurrect original empty tar archive test
  t5004: avoid using tar for checking emptiness of archive

Conflicts:
	t/t5004-archive-corner-cases.sh
This commit is contained in:
Junio C Hamano 2013-07-03 15:36:54 -07:00
commit 250ee16c14
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
t/t5004-archive-corner-cases.sh
View File

@ -27,6 +27,21 @@ check_dir() {
test_cmp expect actual test_cmp expect actual
} }
# 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
'
test_expect_success 'tar archive of empty tree is empty' ' test_expect_success 'tar archive of empty tree is empty' '
git archive --format=tar HEAD: >empty.tar && git archive --format=tar HEAD: >empty.tar &&
perl -e "print \"\\0\" x 10240" >10knuls.tar && perl -e "print \"\\0\" x 10240" >10knuls.tar &&

BIN
t/t5004/empty-with-pax-header.tar Normal file
View File

Binary file not shown.