t0000: modernise style
Match the style to more modern test scripts, namely: - Prefer tabs for indentation. - The first line of each test has prereq, title and opening sq for the script body. - Move cleanup or initialization of data used by a test inside the test itself. - Put a newline before the closing sq for each test. - Don't conclude the test descriptions with a full stop. - Prefer 'test_line_count = COUNT FILE' over 'test $(wc -l <FILE) = COUNT' - Prefer 'test_line_count = 0 FILE' over 'cmp -s /dev/null FILE' - Use '<<-EOF' style for here documents, so that they can be indented as well. Bot don't do that in case the resulting lines would be too long. Also when there is no $variable_substitution in the body of a here document, quote \EOF. - Don't redirect the output of commands to /dev/null unconditionally, the git testing framework should already take care of handling test verbosity transparently and uniformly. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
Stefano Lattarini
Junio C Hamano
parent
661bfd13b4
commit
1b5b2b641a
549
t/t0000-basic.sh
549
t/t0000-basic.sh
|
|
@ -34,69 +34,69 @@ fi
|
||||||
# git init has been done in an empty repository.
|
# git init has been done in an empty repository.
|
||||||
# make sure it is empty.
|
# make sure it is empty.
|
||||||
|
|
||||||
find .git/objects -type f -print >should-be-empty
|
test_expect_success '.git/objects should be empty after git init in an empty repo' '
|
||||||
test_expect_success \
|
find .git/objects -type f -print >should-be-empty &&
|
||||||
'.git/objects should be empty after git init in an empty repo.' \
|
test_line_count = 0 should-be-empty
|
||||||
'cmp -s /dev/null should-be-empty'
|
'
|
||||||
|
|
||||||
# also it should have 2 subdirectories; no fan-out anymore, pack, and info.
|
# also it should have 2 subdirectories; no fan-out anymore, pack, and info.
|
||||||
# 3 is counting "objects" itself
|
# 3 is counting "objects" itself
|
||||||
find .git/objects -type d -print >full-of-directories
|
test_expect_success '.git/objects should have 3 subdirectories' '
|
||||||
test_expect_success \
|
find .git/objects -type d -print >full-of-directories &&
|
||||||
'.git/objects should have 3 subdirectories.' \
|
test_line_count = 3 full-of-directories
|
||||||
'test $(wc -l < full-of-directories) = 3'
|
'
|
||||||
|
|
||||||
################################################################
|
################################################################
|
||||||
# Test harness
|
# Test harness
|
||||||
test_expect_success 'success is reported like this' '
|
test_expect_success 'success is reported like this' '
|
||||||
:
|
:
|
||||||
'
|
'
|
||||||
test_expect_failure 'pretend we have a known breakage' '
|
test_expect_failure 'pretend we have a known breakage' '
|
||||||
false
|
false
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'pretend we have fixed a known breakage (run in sub test-lib)' "
|
test_expect_success 'pretend we have fixed a known breakage (run in sub test-lib)' "
|
||||||
mkdir passing-todo &&
|
mkdir passing-todo &&
|
||||||
(cd passing-todo &&
|
(cd passing-todo &&
|
||||||
cat >passing-todo.sh <<EOF &&
|
cat >passing-todo.sh <<-EOF &&
|
||||||
#!$SHELL_PATH
|
#!$SHELL_PATH
|
||||||
|
|
||||||
test_description='A passing TODO test
|
test_description='A passing TODO test
|
||||||
|
|
||||||
This is run in a sub test-lib so that we do not get incorrect passing
|
This is run in a sub test-lib so that we do not get incorrect
|
||||||
metrics
|
passing metrics
|
||||||
'
|
'
|
||||||
|
|
||||||
# Point to the t/test-lib.sh, which isn't in ../ as usual
|
# Point to the t/test-lib.sh, which isn't in ../ as usual
|
||||||
TEST_DIRECTORY=\"$TEST_DIRECTORY\"
|
TEST_DIRECTORY=\"$TEST_DIRECTORY\"
|
||||||
. \"\$TEST_DIRECTORY\"/test-lib.sh
|
. \"\$TEST_DIRECTORY\"/test-lib.sh
|
||||||
|
|
||||||
test_expect_failure 'pretend we have fixed a known breakage' '
|
test_expect_failure 'pretend we have fixed a known breakage' '
|
||||||
:
|
:
|
||||||
'
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
EOF
|
EOF
|
||||||
chmod +x passing-todo.sh &&
|
chmod +x passing-todo.sh &&
|
||||||
./passing-todo.sh >out 2>err &&
|
./passing-todo.sh >out 2>err &&
|
||||||
! test -s err &&
|
! test -s err &&
|
||||||
sed -e 's/^> //' >expect <<EOF &&
|
sed -e 's/^> //' >expect <<-\\EOF &&
|
||||||
> ok 1 - pretend we have fixed a known breakage # TODO known breakage
|
> ok 1 - pretend we have fixed a known breakage # TODO known breakage
|
||||||
> # fixed 1 known breakage(s)
|
> # fixed 1 known breakage(s)
|
||||||
> # passed all 1 test(s)
|
> # passed all 1 test(s)
|
||||||
> 1..1
|
> 1..1
|
||||||
EOF
|
EOF
|
||||||
test_cmp expect out)
|
test_cmp expect out)
|
||||||
"
|
"
|
||||||
test_set_prereq HAVEIT
|
test_set_prereq HAVEIT
|
||||||
haveit=no
|
haveit=no
|
||||||
test_expect_success HAVEIT 'test runs if prerequisite is satisfied' '
|
test_expect_success HAVEIT 'test runs if prerequisite is satisfied' '
|
||||||
test_have_prereq HAVEIT &&
|
test_have_prereq HAVEIT &&
|
||||||
haveit=yes
|
haveit=yes
|
||||||
'
|
'
|
||||||
donthaveit=yes
|
donthaveit=yes
|
||||||
test_expect_success DONTHAVEIT 'unmet prerequisite causes test to be skipped' '
|
test_expect_success DONTHAVEIT 'unmet prerequisite causes test to be skipped' '
|
||||||
donthaveit=no
|
donthaveit=no
|
||||||
'
|
'
|
||||||
if test $haveit$donthaveit != yesyes
|
if test $haveit$donthaveit != yesyes
|
||||||
then
|
then
|
||||||
|
|
@ -107,17 +107,17 @@ fi
|
||||||
test_set_prereq HAVETHIS
|
test_set_prereq HAVETHIS
|
||||||
haveit=no
|
haveit=no
|
||||||
test_expect_success HAVETHIS,HAVEIT 'test runs if prerequisites are satisfied' '
|
test_expect_success HAVETHIS,HAVEIT 'test runs if prerequisites are satisfied' '
|
||||||
test_have_prereq HAVEIT &&
|
test_have_prereq HAVEIT &&
|
||||||
test_have_prereq HAVETHIS &&
|
test_have_prereq HAVETHIS &&
|
||||||
haveit=yes
|
haveit=yes
|
||||||
'
|
'
|
||||||
donthaveit=yes
|
donthaveit=yes
|
||||||
test_expect_success HAVEIT,DONTHAVEIT 'unmet prerequisites causes test to be skipped' '
|
test_expect_success HAVEIT,DONTHAVEIT 'unmet prerequisites causes test to be skipped' '
|
||||||
donthaveit=no
|
donthaveit=no
|
||||||
'
|
'
|
||||||
donthaveiteither=yes
|
donthaveiteither=yes
|
||||||
test_expect_success DONTHAVEIT,HAVEIT 'unmet prerequisites causes test to be skipped' '
|
test_expect_success DONTHAVEIT,HAVEIT 'unmet prerequisites causes test to be skipped' '
|
||||||
donthaveiteither=no
|
donthaveiteither=no
|
||||||
'
|
'
|
||||||
if test $haveit$donthaveit$donthaveiteither != yesyesyes
|
if test $haveit$donthaveit$donthaveiteither != yesyesyes
|
||||||
then
|
then
|
||||||
|
|
@ -127,7 +127,7 @@ fi
|
||||||
|
|
||||||
clean=no
|
clean=no
|
||||||
test_expect_success 'tests clean up after themselves' '
|
test_expect_success 'tests clean up after themselves' '
|
||||||
test_when_finished clean=yes
|
test_when_finished clean=yes
|
||||||
'
|
'
|
||||||
|
|
||||||
if test $clean != yes
|
if test $clean != yes
|
||||||
|
|
@ -137,106 +137,100 @@ then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
test_expect_success 'tests clean up even on failures' "
|
test_expect_success 'tests clean up even on failures' "
|
||||||
mkdir failing-cleanup &&
|
mkdir failing-cleanup &&
|
||||||
(cd failing-cleanup &&
|
(
|
||||||
cat >failing-cleanup.sh <<EOF &&
|
cd failing-cleanup &&
|
||||||
#!$SHELL_PATH
|
|
||||||
|
|
||||||
test_description='Failing tests with cleanup commands'
|
cat >failing-cleanup.sh <<-EOF &&
|
||||||
|
#!$SHELL_PATH
|
||||||
|
|
||||||
# Point to the t/test-lib.sh, which isn't in ../ as usual
|
test_description='Failing tests with cleanup commands'
|
||||||
TEST_DIRECTORY=\"$TEST_DIRECTORY\"
|
|
||||||
. \"\$TEST_DIRECTORY\"/test-lib.sh
|
|
||||||
|
|
||||||
test_expect_success 'tests clean up even after a failure' '
|
# Point to the t/test-lib.sh, which isn't in ../ as usual
|
||||||
touch clean-after-failure &&
|
TEST_DIRECTORY=\"$TEST_DIRECTORY\"
|
||||||
test_when_finished rm clean-after-failure &&
|
. \"\$TEST_DIRECTORY\"/test-lib.sh
|
||||||
(exit 1)
|
|
||||||
'
|
|
||||||
|
|
||||||
test_expect_success 'failure to clean up causes the test to fail' '
|
test_expect_success 'tests clean up even after a failure' '
|
||||||
test_when_finished \"(exit 2)\"
|
touch clean-after-failure &&
|
||||||
'
|
test_when_finished rm clean-after-failure &&
|
||||||
|
(exit 1)
|
||||||
|
'
|
||||||
|
test_expect_success 'failure to clean up causes the test to fail' '
|
||||||
|
test_when_finished \"(exit 2)\"
|
||||||
|
'
|
||||||
|
test_done
|
||||||
|
|
||||||
test_done
|
EOF
|
||||||
EOF
|
|
||||||
chmod +x failing-cleanup.sh &&
|
chmod +x failing-cleanup.sh &&
|
||||||
test_must_fail ./failing-cleanup.sh >out 2>err &&
|
test_must_fail ./failing-cleanup.sh >out 2>err &&
|
||||||
! test -s err &&
|
! test -s err &&
|
||||||
! test -f \"trash directory.failing-cleanup/clean-after-failure\" &&
|
! test -f \"trash directory.failing-cleanup/clean-after-failure\" &&
|
||||||
sed -e 's/Z$//' -e 's/^> //' >expect <<\EOF &&
|
sed -e 's/Z$//' -e 's/^> //' >expect <<-\\EOF &&
|
||||||
> not ok - 1 tests clean up even after a failure
|
> not ok - 1 tests clean up even after a failure
|
||||||
> # Z
|
> # Z
|
||||||
> # touch clean-after-failure &&
|
> # touch clean-after-failure &&
|
||||||
> # test_when_finished rm clean-after-failure &&
|
> # test_when_finished rm clean-after-failure &&
|
||||||
> # (exit 1)
|
> # (exit 1)
|
||||||
> # Z
|
> # Z
|
||||||
> not ok - 2 failure to clean up causes the test to fail
|
> not ok - 2 failure to clean up causes the test to fail
|
||||||
> # Z
|
> # Z
|
||||||
> # test_when_finished \"(exit 2)\"
|
> # test_when_finished \"(exit 2)\"
|
||||||
> # Z
|
> # Z
|
||||||
> # failed 2 among 2 test(s)
|
> # failed 2 among 2 test(s)
|
||||||
> 1..2
|
> 1..2
|
||||||
EOF
|
EOF
|
||||||
test_cmp expect out)
|
test_cmp expect out
|
||||||
|
)
|
||||||
"
|
"
|
||||||
|
|
||||||
################################################################
|
################################################################
|
||||||
# Basics of the basics
|
# Basics of the basics
|
||||||
|
|
||||||
# updating a new file without --add should fail.
|
# updating a new file without --add should fail.
|
||||||
test_expect_success 'git update-index without --add should fail adding.' '
|
test_expect_success 'git update-index without --add should fail adding' '
|
||||||
test_must_fail git update-index should-be-empty
|
test_must_fail git update-index should-be-empty
|
||||||
'
|
'
|
||||||
|
|
||||||
# and with --add it should succeed, even if it is empty (it used to fail).
|
# and with --add it should succeed, even if it is empty (it used to fail).
|
||||||
test_expect_success \
|
test_expect_success 'git update-index with --add should succeed' '
|
||||||
'git update-index with --add should succeed.' \
|
git update-index --add should-be-empty
|
||||||
'git update-index --add should-be-empty'
|
|
||||||
|
|
||||||
test_expect_success \
|
|
||||||
'writing tree out with git write-tree' \
|
|
||||||
'tree=$(git write-tree)'
|
|
||||||
|
|
||||||
# we know the shape and contents of the tree and know the object ID for it.
|
|
||||||
test_expect_success \
|
|
||||||
'validate object ID of a known tree.' \
|
|
||||||
'test "$tree" = 7bb943559a305bdd6bdee2cef6e5df2413c3d30a'
|
|
||||||
|
|
||||||
# Removing paths.
|
|
||||||
rm -f should-be-empty full-of-directories
|
|
||||||
test_expect_success 'git update-index without --remove should fail removing.' '
|
|
||||||
test_must_fail git update-index should-be-empty
|
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success \
|
test_expect_success 'writing tree out with git write-tree' '
|
||||||
'git update-index with --remove should be able to remove.' \
|
tree=$(git write-tree)
|
||||||
'git update-index --remove should-be-empty'
|
'
|
||||||
|
|
||||||
|
# we know the shape and contents of the tree and know the object ID for it.
|
||||||
|
test_expect_success 'validate object ID of a known tree' '
|
||||||
|
test "$tree" = 7bb943559a305bdd6bdee2cef6e5df2413c3d30a
|
||||||
|
'
|
||||||
|
|
||||||
|
# Removing paths.
|
||||||
|
test_expect_success 'git update-index without --remove should fail removing' '
|
||||||
|
rm -f should-be-empty full-of-directories &&
|
||||||
|
test_must_fail git update-index should-be-empty
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'git update-index with --remove should be able to remove' '
|
||||||
|
git update-index --remove should-be-empty
|
||||||
|
'
|
||||||
|
|
||||||
# Empty tree can be written with recent write-tree.
|
# Empty tree can be written with recent write-tree.
|
||||||
test_expect_success \
|
test_expect_success 'git write-tree should be able to write an empty tree' '
|
||||||
'git write-tree should be able to write an empty tree.' \
|
tree=$(git write-tree)
|
||||||
'tree=$(git write-tree)'
|
'
|
||||||
|
|
||||||
test_expect_success \
|
test_expect_success 'validate object ID of a known tree' '
|
||||||
'validate object ID of a known tree.' \
|
test "$tree" = 4b825dc642cb6eb9a060e54bf8d69288fbee4904
|
||||||
'test "$tree" = 4b825dc642cb6eb9a060e54bf8d69288fbee4904'
|
'
|
||||||
|
|
||||||
# Various types of objects
|
# Various types of objects
|
||||||
|
|
||||||
# Some filesystems do not support symblic links; on such systems
|
# Some filesystems do not support symblic links; on such systems
|
||||||
# some expected values are different
|
# some expected values are different
|
||||||
mkdir path2 path3 path3/subp3
|
|
||||||
paths='path0 path2/file2 path3/file3 path3/subp3/file3'
|
|
||||||
for p in $paths
|
|
||||||
do
|
|
||||||
echo "hello $p" >$p
|
|
||||||
done
|
|
||||||
if test_have_prereq SYMLINKS
|
if test_have_prereq SYMLINKS
|
||||||
then
|
then
|
||||||
for p in $paths
|
|
||||||
do
|
|
||||||
ln -s "hello $p" ${p}sym
|
|
||||||
done
|
|
||||||
expectfilter=cat
|
expectfilter=cat
|
||||||
expectedtree=087704a96baf1c2d1c869a8b084481e121c88b5b
|
expectedtree=087704a96baf1c2d1c869a8b084481e121c88b5b
|
||||||
expectedptree1=21ae8269cacbe57ae09138dcc3a2887f904d02b3
|
expectedptree1=21ae8269cacbe57ae09138dcc3a2887f904d02b3
|
||||||
|
|
@ -248,135 +242,154 @@ else
|
||||||
expectedptree2=ce580448f0148b985a513b693fdf7d802cacb44f
|
expectedptree2=ce580448f0148b985a513b693fdf7d802cacb44f
|
||||||
fi
|
fi
|
||||||
|
|
||||||
test_expect_success \
|
|
||||||
'adding various types of objects with git update-index --add.' \
|
test_expect_success 'adding various types of objects with git update-index --add' '
|
||||||
'find path* ! -type d -print | xargs git update-index --add'
|
mkdir path2 path3 path3/subp3 &&
|
||||||
|
paths="path0 path2/file2 path3/file3 path3/subp3/file3" &&
|
||||||
|
(
|
||||||
|
for p in $paths
|
||||||
|
do
|
||||||
|
echo "hello $p" >$p || exit 1
|
||||||
|
if test_have_prereq SYMLINKS
|
||||||
|
then
|
||||||
|
ln -s "hello $p" ${p}sym || exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
) &&
|
||||||
|
find path* ! -type d -print | xargs git update-index --add
|
||||||
|
'
|
||||||
|
|
||||||
# Show them and see that matches what we expect.
|
# Show them and see that matches what we expect.
|
||||||
test_expect_success \
|
test_expect_success 'showing stage with git ls-files --stage' '
|
||||||
'showing stage with git ls-files --stage' \
|
git ls-files --stage >current
|
||||||
'git ls-files --stage >current'
|
'
|
||||||
|
|
||||||
$expectfilter >expected <<\EOF
|
test_expect_success 'validate git ls-files output for a known tree' '
|
||||||
100644 f87290f8eb2cbbea7857214459a0739927eab154 0 path0
|
$expectfilter >expected <<-\EOF &&
|
||||||
120000 15a98433ae33114b085f3eb3bb03b832b3180a01 0 path0sym
|
100644 f87290f8eb2cbbea7857214459a0739927eab154 0 path0
|
||||||
100644 3feff949ed00a62d9f7af97c15cd8a30595e7ac7 0 path2/file2
|
120000 15a98433ae33114b085f3eb3bb03b832b3180a01 0 path0sym
|
||||||
120000 d8ce161addc5173867a3c3c730924388daedbc38 0 path2/file2sym
|
100644 3feff949ed00a62d9f7af97c15cd8a30595e7ac7 0 path2/file2
|
||||||
100644 0aa34cae68d0878578ad119c86ca2b5ed5b28376 0 path3/file3
|
120000 d8ce161addc5173867a3c3c730924388daedbc38 0 path2/file2sym
|
||||||
120000 8599103969b43aff7e430efea79ca4636466794f 0 path3/file3sym
|
100644 0aa34cae68d0878578ad119c86ca2b5ed5b28376 0 path3/file3
|
||||||
100644 00fb5908cb97c2564a9783c0c64087333b3b464f 0 path3/subp3/file3
|
120000 8599103969b43aff7e430efea79ca4636466794f 0 path3/file3sym
|
||||||
120000 6649a1ebe9e9f1c553b66f5a6e74136a07ccc57c 0 path3/subp3/file3sym
|
100644 00fb5908cb97c2564a9783c0c64087333b3b464f 0 path3/subp3/file3
|
||||||
EOF
|
120000 6649a1ebe9e9f1c553b66f5a6e74136a07ccc57c 0 path3/subp3/file3sym
|
||||||
test_expect_success \
|
EOF
|
||||||
'validate git ls-files output for a known tree.' \
|
test_cmp expected current
|
||||||
'test_cmp expected current'
|
'
|
||||||
|
|
||||||
test_expect_success \
|
test_expect_success 'writing tree out with git write-tree' '
|
||||||
'writing tree out with git write-tree.' \
|
tree=$(git write-tree)
|
||||||
'tree=$(git write-tree)'
|
'
|
||||||
test_expect_success \
|
|
||||||
'validate object ID for a known tree.' \
|
|
||||||
'test "$tree" = "$expectedtree"'
|
|
||||||
|
|
||||||
test_expect_success \
|
test_expect_success 'validate object ID for a known tree' '
|
||||||
'showing tree with git ls-tree' \
|
test "$tree" = "$expectedtree"
|
||||||
'git ls-tree $tree >current'
|
'
|
||||||
cat >expected <<\EOF
|
|
||||||
100644 blob f87290f8eb2cbbea7857214459a0739927eab154 path0
|
test_expect_success 'showing tree with git ls-tree' '
|
||||||
120000 blob 15a98433ae33114b085f3eb3bb03b832b3180a01 path0sym
|
git ls-tree $tree >current
|
||||||
040000 tree 58a09c23e2ca152193f2786e06986b7b6712bdbe path2
|
'
|
||||||
040000 tree 21ae8269cacbe57ae09138dcc3a2887f904d02b3 path3
|
|
||||||
EOF
|
test_expect_success SYMLINKS 'git ls-tree output for a known tree' '
|
||||||
test_expect_success SYMLINKS \
|
cat >expected <<-\EOF &&
|
||||||
'git ls-tree output for a known tree.' \
|
100644 blob f87290f8eb2cbbea7857214459a0739927eab154 path0
|
||||||
'test_cmp expected current'
|
120000 blob 15a98433ae33114b085f3eb3bb03b832b3180a01 path0sym
|
||||||
|
040000 tree 58a09c23e2ca152193f2786e06986b7b6712bdbe path2
|
||||||
|
040000 tree 21ae8269cacbe57ae09138dcc3a2887f904d02b3 path3
|
||||||
|
EOF
|
||||||
|
test_cmp expected current
|
||||||
|
'
|
||||||
|
|
||||||
# This changed in ls-tree pathspec change -- recursive does
|
# This changed in ls-tree pathspec change -- recursive does
|
||||||
# not show tree nodes anymore.
|
# not show tree nodes anymore.
|
||||||
test_expect_success \
|
test_expect_success 'showing tree with git ls-tree -r' '
|
||||||
'showing tree with git ls-tree -r' \
|
git ls-tree -r $tree >current
|
||||||
'git ls-tree -r $tree >current'
|
|
||||||
$expectfilter >expected <<\EOF
|
|
||||||
100644 blob f87290f8eb2cbbea7857214459a0739927eab154 path0
|
|
||||||
120000 blob 15a98433ae33114b085f3eb3bb03b832b3180a01 path0sym
|
|
||||||
100644 blob 3feff949ed00a62d9f7af97c15cd8a30595e7ac7 path2/file2
|
|
||||||
120000 blob d8ce161addc5173867a3c3c730924388daedbc38 path2/file2sym
|
|
||||||
100644 blob 0aa34cae68d0878578ad119c86ca2b5ed5b28376 path3/file3
|
|
||||||
120000 blob 8599103969b43aff7e430efea79ca4636466794f path3/file3sym
|
|
||||||
100644 blob 00fb5908cb97c2564a9783c0c64087333b3b464f path3/subp3/file3
|
|
||||||
120000 blob 6649a1ebe9e9f1c553b66f5a6e74136a07ccc57c path3/subp3/file3sym
|
|
||||||
EOF
|
|
||||||
test_expect_success \
|
|
||||||
'git ls-tree -r output for a known tree.' \
|
|
||||||
'test_cmp expected current'
|
|
||||||
|
|
||||||
# But with -r -t we can have both.
|
|
||||||
test_expect_success \
|
|
||||||
'showing tree with git ls-tree -r -t' \
|
|
||||||
'git ls-tree -r -t $tree >current'
|
|
||||||
cat >expected <<\EOF
|
|
||||||
100644 blob f87290f8eb2cbbea7857214459a0739927eab154 path0
|
|
||||||
120000 blob 15a98433ae33114b085f3eb3bb03b832b3180a01 path0sym
|
|
||||||
040000 tree 58a09c23e2ca152193f2786e06986b7b6712bdbe path2
|
|
||||||
100644 blob 3feff949ed00a62d9f7af97c15cd8a30595e7ac7 path2/file2
|
|
||||||
120000 blob d8ce161addc5173867a3c3c730924388daedbc38 path2/file2sym
|
|
||||||
040000 tree 21ae8269cacbe57ae09138dcc3a2887f904d02b3 path3
|
|
||||||
100644 blob 0aa34cae68d0878578ad119c86ca2b5ed5b28376 path3/file3
|
|
||||||
120000 blob 8599103969b43aff7e430efea79ca4636466794f path3/file3sym
|
|
||||||
040000 tree 3c5e5399f3a333eddecce7a9b9465b63f65f51e2 path3/subp3
|
|
||||||
100644 blob 00fb5908cb97c2564a9783c0c64087333b3b464f path3/subp3/file3
|
|
||||||
120000 blob 6649a1ebe9e9f1c553b66f5a6e74136a07ccc57c path3/subp3/file3sym
|
|
||||||
EOF
|
|
||||||
test_expect_success SYMLINKS \
|
|
||||||
'git ls-tree -r output for a known tree.' \
|
|
||||||
'test_cmp expected current'
|
|
||||||
|
|
||||||
test_expect_success \
|
|
||||||
'writing partial tree out with git write-tree --prefix.' \
|
|
||||||
'ptree=$(git write-tree --prefix=path3)'
|
|
||||||
test_expect_success \
|
|
||||||
'validate object ID for a known tree.' \
|
|
||||||
'test "$ptree" = "$expectedptree1"'
|
|
||||||
|
|
||||||
test_expect_success \
|
|
||||||
'writing partial tree out with git write-tree --prefix.' \
|
|
||||||
'ptree=$(git write-tree --prefix=path3/subp3)'
|
|
||||||
test_expect_success \
|
|
||||||
'validate object ID for a known tree.' \
|
|
||||||
'test "$ptree" = "$expectedptree2"'
|
|
||||||
|
|
||||||
cat >badobjects <<EOF
|
|
||||||
100644 blob 1000000000000000000000000000000000000000 dir/file1
|
|
||||||
100644 blob 2000000000000000000000000000000000000000 dir/file2
|
|
||||||
100644 blob 3000000000000000000000000000000000000000 dir/file3
|
|
||||||
100644 blob 4000000000000000000000000000000000000000 dir/file4
|
|
||||||
100644 blob 5000000000000000000000000000000000000000 dir/file5
|
|
||||||
EOF
|
|
||||||
|
|
||||||
rm .git/index
|
|
||||||
test_expect_success \
|
|
||||||
'put invalid objects into the index.' \
|
|
||||||
'git update-index --index-info < badobjects'
|
|
||||||
|
|
||||||
test_expect_success 'writing this tree without --missing-ok.' '
|
|
||||||
test_must_fail git write-tree
|
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success \
|
test_expect_success 'git ls-tree -r output for a known tree' '
|
||||||
'writing this tree with --missing-ok.' \
|
$expectfilter >expected <<-\EOF &&
|
||||||
'git write-tree --missing-ok'
|
100644 blob f87290f8eb2cbbea7857214459a0739927eab154 path0
|
||||||
|
120000 blob 15a98433ae33114b085f3eb3bb03b832b3180a01 path0sym
|
||||||
|
100644 blob 3feff949ed00a62d9f7af97c15cd8a30595e7ac7 path2/file2
|
||||||
|
120000 blob d8ce161addc5173867a3c3c730924388daedbc38 path2/file2sym
|
||||||
|
100644 blob 0aa34cae68d0878578ad119c86ca2b5ed5b28376 path3/file3
|
||||||
|
120000 blob 8599103969b43aff7e430efea79ca4636466794f path3/file3sym
|
||||||
|
100644 blob 00fb5908cb97c2564a9783c0c64087333b3b464f path3/subp3/file3
|
||||||
|
120000 blob 6649a1ebe9e9f1c553b66f5a6e74136a07ccc57c path3/subp3/file3sym
|
||||||
|
EOF
|
||||||
|
test_cmp expected current
|
||||||
|
'
|
||||||
|
|
||||||
|
# But with -r -t we can have both.
|
||||||
|
test_expect_success 'showing tree with git ls-tree -r -t' '
|
||||||
|
git ls-tree -r -t $tree >current
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success SYMLINKS 'git ls-tree -r output for a known tree' '
|
||||||
|
cat >expected <<-\EOF &&
|
||||||
|
100644 blob f87290f8eb2cbbea7857214459a0739927eab154 path0
|
||||||
|
120000 blob 15a98433ae33114b085f3eb3bb03b832b3180a01 path0sym
|
||||||
|
040000 tree 58a09c23e2ca152193f2786e06986b7b6712bdbe path2
|
||||||
|
100644 blob 3feff949ed00a62d9f7af97c15cd8a30595e7ac7 path2/file2
|
||||||
|
120000 blob d8ce161addc5173867a3c3c730924388daedbc38 path2/file2sym
|
||||||
|
040000 tree 21ae8269cacbe57ae09138dcc3a2887f904d02b3 path3
|
||||||
|
100644 blob 0aa34cae68d0878578ad119c86ca2b5ed5b28376 path3/file3
|
||||||
|
120000 blob 8599103969b43aff7e430efea79ca4636466794f path3/file3sym
|
||||||
|
040000 tree 3c5e5399f3a333eddecce7a9b9465b63f65f51e2 path3/subp3
|
||||||
|
100644 blob 00fb5908cb97c2564a9783c0c64087333b3b464f path3/subp3/file3
|
||||||
|
120000 blob 6649a1ebe9e9f1c553b66f5a6e74136a07ccc57c path3/subp3/file3sym
|
||||||
|
EOF
|
||||||
|
test_cmp expected current
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'writing partial tree out with git write-tree --prefix' '
|
||||||
|
ptree=$(git write-tree --prefix=path3)
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'validate object ID for a known tree' '
|
||||||
|
test "$ptree" = "$expectedptree1"
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'writing partial tree out with git write-tree --prefix' '
|
||||||
|
ptree=$(git write-tree --prefix=path3/subp3)
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'validate object ID for a known tree' '
|
||||||
|
test "$ptree" = "$expectedptree2"
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'put invalid objects into the index' '
|
||||||
|
rm -f .git/index &&
|
||||||
|
cat >badobjects <<-\EOF &&
|
||||||
|
100644 blob 1000000000000000000000000000000000000000 dir/file1
|
||||||
|
100644 blob 2000000000000000000000000000000000000000 dir/file2
|
||||||
|
100644 blob 3000000000000000000000000000000000000000 dir/file3
|
||||||
|
100644 blob 4000000000000000000000000000000000000000 dir/file4
|
||||||
|
100644 blob 5000000000000000000000000000000000000000 dir/file5
|
||||||
|
EOF
|
||||||
|
git update-index --index-info <badobjects
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'writing this tree without --missing-ok' '
|
||||||
|
test_must_fail git write-tree
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'writing this tree with --missing-ok' '
|
||||||
|
git write-tree --missing-ok
|
||||||
|
'
|
||||||
|
|
||||||
|
|
||||||
################################################################
|
################################################################
|
||||||
rm .git/index
|
test_expect_success 'git read-tree followed by write-tree should be idempotent' '
|
||||||
test_expect_success \
|
rm -f .git/index
|
||||||
'git read-tree followed by write-tree should be idempotent.' \
|
git read-tree $tree &&
|
||||||
'git read-tree $tree &&
|
test -f .git/index &&
|
||||||
test -f .git/index &&
|
newtree=$(git write-tree) &&
|
||||||
newtree=$(git write-tree) &&
|
test "$newtree" = "$tree"
|
||||||
test "$newtree" = "$tree"'
|
'
|
||||||
|
|
||||||
$expectfilter >expected <<\EOF
|
test_expect_success 'validate git diff-files output for a know cache/work tree state' '
|
||||||
|
$expectfilter >expected <<\EOF &&
|
||||||
:100644 100644 f87290f8eb2cbbea7857214459a0739927eab154 0000000000000000000000000000000000000000 M path0
|
:100644 100644 f87290f8eb2cbbea7857214459a0739927eab154 0000000000000000000000000000000000000000 M path0
|
||||||
:120000 120000 15a98433ae33114b085f3eb3bb03b832b3180a01 0000000000000000000000000000000000000000 M path0sym
|
:120000 120000 15a98433ae33114b085f3eb3bb03b832b3180a01 0000000000000000000000000000000000000000 M path0sym
|
||||||
:100644 100644 3feff949ed00a62d9f7af97c15cd8a30595e7ac7 0000000000000000000000000000000000000000 M path2/file2
|
:100644 100644 3feff949ed00a62d9f7af97c15cd8a30595e7ac7 0000000000000000000000000000000000000000 M path2/file2
|
||||||
|
|
@ -386,45 +399,47 @@ $expectfilter >expected <<\EOF
|
||||||
:100644 100644 00fb5908cb97c2564a9783c0c64087333b3b464f 0000000000000000000000000000000000000000 M path3/subp3/file3
|
:100644 100644 00fb5908cb97c2564a9783c0c64087333b3b464f 0000000000000000000000000000000000000000 M path3/subp3/file3
|
||||||
:120000 120000 6649a1ebe9e9f1c553b66f5a6e74136a07ccc57c 0000000000000000000000000000000000000000 M path3/subp3/file3sym
|
:120000 120000 6649a1ebe9e9f1c553b66f5a6e74136a07ccc57c 0000000000000000000000000000000000000000 M path3/subp3/file3sym
|
||||||
EOF
|
EOF
|
||||||
test_expect_success \
|
git diff-files >current &&
|
||||||
'validate git diff-files output for a know cache/work tree state.' \
|
test_cmp current expected
|
||||||
'git diff-files >current && test_cmp current expected >/dev/null'
|
'
|
||||||
|
|
||||||
test_expect_success \
|
test_expect_success 'git update-index --refresh should succeed' '
|
||||||
'git update-index --refresh should succeed.' \
|
git update-index --refresh
|
||||||
'git update-index --refresh'
|
'
|
||||||
|
|
||||||
test_expect_success \
|
test_expect_success 'no diff after checkout and git update-index --refresh' '
|
||||||
'no diff after checkout and git update-index --refresh.' \
|
git diff-files >current &&
|
||||||
'git diff-files >current && cmp -s current /dev/null'
|
cmp -s current /dev/null
|
||||||
|
'
|
||||||
|
|
||||||
################################################################
|
################################################################
|
||||||
P=$expectedtree
|
P=$expectedtree
|
||||||
test_expect_success \
|
|
||||||
'git commit-tree records the correct tree in a commit.' \
|
|
||||||
'commit0=$(echo NO | git commit-tree $P) &&
|
|
||||||
tree=$(git show --pretty=raw $commit0 |
|
|
||||||
sed -n -e "s/^tree //p" -e "/^author /q") &&
|
|
||||||
test "z$tree" = "z$P"'
|
|
||||||
|
|
||||||
test_expect_success \
|
test_expect_success 'git commit-tree records the correct tree in a commit' '
|
||||||
'git commit-tree records the correct parent in a commit.' \
|
commit0=$(echo NO | git commit-tree $P) &&
|
||||||
'commit1=$(echo NO | git commit-tree $P -p $commit0) &&
|
tree=$(git show --pretty=raw $commit0 |
|
||||||
parent=$(git show --pretty=raw $commit1 |
|
sed -n -e "s/^tree //p" -e "/^author /q") &&
|
||||||
sed -n -e "s/^parent //p" -e "/^author /q") &&
|
test "z$tree" = "z$P"
|
||||||
test "z$commit0" = "z$parent"'
|
'
|
||||||
|
|
||||||
test_expect_success \
|
test_expect_success 'git commit-tree records the correct parent in a commit' '
|
||||||
'git commit-tree omits duplicated parent in a commit.' \
|
commit1=$(echo NO | git commit-tree $P -p $commit0) &&
|
||||||
'commit2=$(echo NO | git commit-tree $P -p $commit0 -p $commit0) &&
|
parent=$(git show --pretty=raw $commit1 |
|
||||||
parent=$(git show --pretty=raw $commit2 |
|
sed -n -e "s/^parent //p" -e "/^author /q") &&
|
||||||
sed -n -e "s/^parent //p" -e "/^author /q" |
|
test "z$commit0" = "z$parent"
|
||||||
sort -u) &&
|
'
|
||||||
test "z$commit0" = "z$parent" &&
|
|
||||||
numparent=$(git show --pretty=raw $commit2 |
|
test_expect_success 'git commit-tree omits duplicated parent in a commit' '
|
||||||
sed -n -e "s/^parent //p" -e "/^author /q" |
|
commit2=$(echo NO | git commit-tree $P -p $commit0 -p $commit0) &&
|
||||||
wc -l) &&
|
parent=$(git show --pretty=raw $commit2 |
|
||||||
test $numparent = 1'
|
sed -n -e "s/^parent //p" -e "/^author /q" |
|
||||||
|
sort -u) &&
|
||||||
|
test "z$commit0" = "z$parent" &&
|
||||||
|
numparent=$(git show --pretty=raw $commit2 |
|
||||||
|
sed -n -e "s/^parent //p" -e "/^author /q" |
|
||||||
|
wc -l) &&
|
||||||
|
test $numparent = 1
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'update-index D/F conflict' '
|
test_expect_success 'update-index D/F conflict' '
|
||||||
mv path0 tmp &&
|
mv path0 tmp &&
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue