kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t4007: modernize the style 

This is one of the oldest scripts; update it to match more modern style.
Notably, we should:

 - Put the test title on the same line as the "test_expect_success", and
   end the line with a single-quote to begin the body of the test which is
   one multi-line string; and

 - Run as many commands inside test_expect_success, not outside, to catch
   unexpected breakages.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2009-05-22 23:06:58 -07:00
parent b87fc96476
commit aceae2ef92
1 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
t/t4007-rename-3.sh
View File

@ -9,32 +9,31 @@ test_description='Rename interaction with pathspec.
. ./test-lib.sh . ./test-lib.sh
. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash . "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash


test_expect_success \ test_expect_success 'prepare reference tree' '
'prepare reference tree' \ mkdir path0 path1 &&
'mkdir path0 path1 && cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
cp "$TEST_DIRECTORY"/../COPYING path0/COPYING && git update-index --add path0/COPYING &&
git update-index --add path0/COPYING && tree=$(git write-tree) &&
tree=$(git write-tree) && echo $tree
echo $tree' '


test_expect_success \ test_expect_success 'prepare work tree' '
'prepare work tree' \ cp path0/COPYING path1/COPYING &&
'cp path0/COPYING path1/COPYING && git update-index --add --remove path0/COPYING path1/COPYING
git update-index --add --remove path0/COPYING path1/COPYING' '


# In the tree, there is only path0/COPYING. In the cache, path0 and # In the tree, there is only path0/COPYING. In the cache, path0 and
# path1 both have COPYING and the latter is a copy of path0/COPYING. # path1 both have COPYING and the latter is a copy of path0/COPYING.
# Comparing the full tree with cache should tell us so. # Comparing the full tree with cache should tell us so.


git diff-index -C --find-copies-harder $tree >current

cat >expected <<\EOF cat >expected <<\EOF
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 C100 path0/COPYING path1/COPYING :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 C100 path0/COPYING path1/COPYING
EOF EOF


test_expect_success \ test_expect_success 'copy detection' '
'validate the result (#1)' \ git diff-index -C --find-copies-harder $tree >current &&
'compare_diff_raw current expected' compare_diff_raw current expected
'


# In the tree, there is only path0/COPYING. In the cache, path0 and # In the tree, there is only path0/COPYING. In the cache, path0 and
# path1 both have COPYING and the latter is a copy of path0/COPYING. # path1 both have COPYING and the latter is a copy of path0/COPYING.
@ -42,49 +41,45 @@ test_expect_success \
# path1/COPYING suddenly appearing from nowhere, not detected as # path1/COPYING suddenly appearing from nowhere, not detected as
# a copy from path0/COPYING. # a copy from path0/COPYING.


git diff-index -C $tree path1 >current

cat >expected <<\EOF cat >expected <<\EOF
:000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 A path1/COPYING :000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 A path1/COPYING
EOF EOF


test_expect_success \ test_expect_success 'copy, limited to a subtree' '
'validate the result (#2)' \ git diff-index -C --find-copies-harder $tree path1 >current &&
'compare_diff_raw current expected' compare_diff_raw current expected

'
test_expect_success \
'tweak work tree' \
'rm -f path0/COPYING &&
git update-index --remove path0/COPYING'


test_expect_success 'tweak work tree' '
rm -f path0/COPYING &&
git update-index --remove path0/COPYING
'
# In the tree, there is only path0/COPYING. In the cache, path0 does # In the tree, there is only path0/COPYING. In the cache, path0 does
# not have COPYING anymore and path1 has COPYING which is a copy of # not have COPYING anymore and path1 has COPYING which is a copy of
# path0/COPYING. Showing the full tree with cache should tell us about # path0/COPYING. Showing the full tree with cache should tell us about
# the rename. # the rename.


git diff-index -C $tree >current

cat >expected <<\EOF cat >expected <<\EOF
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100 path0/COPYING path1/COPYING :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100 path0/COPYING path1/COPYING
EOF EOF


test_expect_success \ test_expect_success 'rename detection' '
'validate the result (#3)' \ git diff-index -C --find-copies-harder $tree >current &&
'compare_diff_raw current expected' compare_diff_raw current expected
'


# In the tree, there is only path0/COPYING. In the cache, path0 does # In the tree, there is only path0/COPYING. In the cache, path0 does
# not have COPYING anymore and path1 has COPYING which is a copy of # not have COPYING anymore and path1 has COPYING which is a copy of
# path0/COPYING. When we say we care only about path1, we should just # path0/COPYING. When we say we care only about path1, we should just
# see path1/COPYING appearing from nowhere. # see path1/COPYING appearing from nowhere.


git diff-index -C $tree path1 >current

cat >expected <<\EOF cat >expected <<\EOF
:000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 A path1/COPYING :000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 A path1/COPYING
EOF EOF


test_expect_success \ test_expect_success 'rename, limited to a subtree' '
'validate the result (#4)' \ git diff-index -C --find-copies-harder $tree path1 >current &&
'compare_diff_raw current expected' compare_diff_raw current expected
'


test_done test_done