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

Merge branch 'sv/t7001-modernize'

Browse Source 
Test script modernization.

* sv/t7001-modernize:
  t7001: use `test` rather than `[`
  t7001: use here-docs instead of echo
  t7001: put each command on a separate line
  t7001: use '>' rather than 'touch'
  t7001: avoid using `cd` outside of subshells
  t7001: remove whitespace after redirect operators
  t7001: modernize subshell formatting
  t7001: remove unnecessary blank lines
  t7001: indent with TABs instead of spaces
  t7001: modernize test formatting
This commit is contained in:
Junio C Hamano 2021-03-01 14:02:57 -08:00
commit fbad3505ee
1 changed files with 177 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

376
t/t7001-mv.sh
View File

@ -3,74 +3,74 @@
test_description='git mv in subdirs' test_description='git mv in subdirs'
. ./test-lib.sh . ./test-lib.sh
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 add path0/COPYING &&
git add path0/COPYING && git commit -m add -a
git commit -m add -a' '
test_expect_success \ test_expect_success 'moving the file out of subdirectory' '
'moving the file out of subdirectory' \ git -C path0 mv COPYING ../path1/COPYING
'cd path0 && git mv COPYING ../path1/COPYING' '
# in path0 currently # in path0 currently
test_expect_success \ test_expect_success 'commiting the change' '
'commiting the change' \ git commit -m move-out -a
'cd .. && git commit -m move-out -a' '
test_expect_success \ test_expect_success 'checking the commit' '
'checking the commit' \ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
'git diff-tree -r -M --name-status HEAD^ HEAD >actual && grep "^R100..*path0/COPYING..*path1/COPYING" actual
grep "^R100..*path0/COPYING..*path1/COPYING" actual' '
test_expect_success \ test_expect_success 'moving the file back into subdirectory' '
'moving the file back into subdirectory' \ git -C path0 mv ../path1/COPYING COPYING
'cd path0 && git mv ../path1/COPYING COPYING' '
# in path0 currently # in path0 currently
test_expect_success \ test_expect_success 'commiting the change' '
'commiting the change' \ git commit -m move-in -a
'cd .. && git commit -m move-in -a' '
test_expect_success \ test_expect_success 'checking the commit' '
'checking the commit' \ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
'git diff-tree -r -M --name-status HEAD^ HEAD >actual && grep "^R100..*path1/COPYING..*path0/COPYING" actual
grep "^R100..*path1/COPYING..*path0/COPYING" actual' '
test_expect_success \ test_expect_success 'mv --dry-run does not move file' '
'mv --dry-run does not move file' \ git mv -n path0/COPYING MOVED &&
'git mv -n path0/COPYING MOVED && test -f path0/COPYING &&
test -f path0/COPYING && test ! -f MOVED
test ! -f MOVED' '
test_expect_success \ test_expect_success 'checking -k on non-existing file' '
'checking -k on non-existing file' \ git mv -k idontexist path0
'git mv -k idontexist path0' '
test_expect_success \ test_expect_success 'checking -k on untracked file' '
'checking -k on untracked file' \ >untracked1 &&
'touch untracked1 && git mv -k untracked1 path0 &&
git mv -k untracked1 path0 && test -f untracked1 &&
test -f untracked1 && test ! -f path0/untracked1
test ! -f path0/untracked1' '
test_expect_success \ test_expect_success 'checking -k on multiple untracked files' '
'checking -k on multiple untracked files' \ >untracked2 &&
'touch untracked2 && git mv -k untracked1 untracked2 path0 &&
git mv -k untracked1 untracked2 path0 && test -f untracked1 &&
test -f untracked1 && test -f untracked2 &&
test -f untracked2 && test ! -f path0/untracked1 &&
test ! -f path0/untracked1 && test ! -f path0/untracked2
test ! -f path0/untracked2' '
test_expect_success \ test_expect_success 'checking -f on untracked file with existing target' '
'checking -f on untracked file with existing target' \ >path0/untracked1 &&
'touch path0/untracked1 && test_must_fail git mv -f untracked1 path0 &&
test_must_fail git mv -f untracked1 path0 && test ! -f .git/index.lock &&
test ! -f .git/index.lock && test -f untracked1 &&
test -f untracked1 && test -f path0/untracked1
test -f path0/untracked1' '
# clean up the mess in case bad things happen # clean up the mess in case bad things happen
rm -f idontexist untracked1 untracked2 \ rm -f idontexist untracked1 untracked2 \
@ -78,87 +78,89 @@ rm -f idontexist untracked1 untracked2 \
.git/index.lock .git/index.lock
rmdir path1 rmdir path1
test_expect_success \ test_expect_success 'moving to absent target with trailing slash' '
'moving to absent target with trailing slash' \ test_must_fail git mv path0/COPYING no-such-dir/ &&
'test_must_fail git mv path0/COPYING no-such-dir/ && test_must_fail git mv path0/COPYING no-such-dir// &&
test_must_fail git mv path0/COPYING no-such-dir// && git mv path0/ no-such-dir/ &&
git mv path0/ no-such-dir/ && test_path_is_dir no-such-dir
test_path_is_dir no-such-dir' '
test_expect_success \ test_expect_success 'clean up' '
'clean up' \ git reset --hard
'git reset --hard' '
test_expect_success \ test_expect_success 'moving to existing untracked target with trailing slash' '
'moving to existing untracked target with trailing slash' \ mkdir path1 &&
'mkdir path1 && git mv path0/ path1/ &&
git mv path0/ path1/ && test_path_is_dir path1/path0/
test_path_is_dir path1/path0/' '
test_expect_success \ test_expect_success 'moving to existing tracked target with trailing slash' '
'moving to existing tracked target with trailing slash' \ mkdir path2 &&
'mkdir path2 && >path2/file && git add path2/file &&
>path2/file && git add path2/file && git mv path1/path0/ path2/ &&
git mv path1/path0/ path2/ && test_path_is_dir path2/path0/
test_path_is_dir path2/path0/' '
test_expect_success \ test_expect_success 'clean up' '
'clean up' \ git reset --hard
'git reset --hard' '
test_expect_success \ test_expect_success 'adding another file' '
'adding another file' \ cp "$TEST_DIRECTORY"/../README.md path0/README &&
'cp "$TEST_DIRECTORY"/../README.md path0/README && git add path0/README &&
git add path0/README && git commit -m add2 -a
git commit -m add2 -a' '
test_expect_success \ test_expect_success 'moving whole subdirectory' '
'moving whole subdirectory' \ git mv path0 path2
'git mv path0 path2' '
test_expect_success \ test_expect_success 'commiting the change' '
'commiting the change' \ git commit -m dir-move -a
'git commit -m dir-move -a' '
test_expect_success \ test_expect_success 'checking the commit' '
'checking the commit' \ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
'git diff-tree -r -M --name-status HEAD^ HEAD >actual && grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
grep "^R100..*path0/COPYING..*path2/COPYING" actual && grep "^R100..*path0/README..*path2/README" actual
grep "^R100..*path0/README..*path2/README" actual' '
test_expect_success \ test_expect_success 'succeed when source is a prefix of destination' '
'succeed when source is a prefix of destination' \ git mv path2/COPYING path2/COPYING-renamed
'git mv path2/COPYING path2/COPYING-renamed' '
test_expect_success \ test_expect_success 'moving whole subdirectory into subdirectory' '
'moving whole subdirectory into subdirectory' \ git mv path2 path1
'git mv path2 path1' '
test_expect_success \ test_expect_success 'commiting the change' '
'commiting the change' \ git commit -m dir-move -a
'git commit -m dir-move -a' '
test_expect_success \ test_expect_success 'checking the commit' '
'checking the commit' \ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
'git diff-tree -r -M --name-status HEAD^ HEAD >actual && grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual && grep "^R100..*path2/README..*path1/path2/README" actual
grep "^R100..*path2/README..*path1/path2/README" actual' '
test_expect_success \ test_expect_success 'do not move directory over existing directory' '
'do not move directory over existing directory' \ mkdir path0 &&
'mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0' mkdir path0/path2 &&
test_must_fail git mv path2 path0
'
test_expect_success \ test_expect_success 'move into "."' '
'move into "."' \ git mv path1/path2/ .
'git mv path1/path2/ .' '
test_expect_success "Michael Cassar's test case" ' test_expect_success "Michael Cassar's test case" '
rm -fr .git papers partA && rm -fr .git papers partA &&
git init && git init &&
mkdir -p papers/unsorted papers/all-papers partA && mkdir -p papers/unsorted papers/all-papers partA &&
echo a > papers/unsorted/Thesis.pdf && echo a >papers/unsorted/Thesis.pdf &&
echo b > partA/outline.txt && echo b >partA/outline.txt &&
echo c > papers/unsorted/_another && echo c >papers/unsorted/_another &&
git add papers partA && git add papers partA &&
T1=$(git write-tree) && T1=$(git write-tree) &&
@ -181,43 +183,42 @@ test_expect_success "Sergey Vlasov's test case" '
git mv ab a git mv ab a
' '
test_expect_success 'absolute pathname' '( test_expect_success 'absolute pathname' '
(
rm -fr mine &&
mkdir mine &&
cd mine &&
test_create_repo one &&
cd one &&
mkdir sub &&
>sub/file &&
git add sub/file &&
rm -fr mine && git mv sub "$(pwd)/in" &&
mkdir mine && ! test -d sub &&
cd mine && test -d in &&
test_create_repo one && git ls-files --error-unmatch in/file
cd one && )
mkdir sub && '
>sub/file &&
git add sub/file &&
git mv sub "$(pwd)/in" && test_expect_success 'absolute pathname outside should fail' '
! test -d sub && (
test -d in && rm -fr mine &&
git ls-files --error-unmatch in/file mkdir mine &&
cd mine &&
out=$(pwd) &&
test_create_repo one &&
cd one &&
mkdir sub &&
>sub/file &&
git add sub/file &&
test_must_fail git mv sub "$out/out" &&
)' test -d sub &&
! test -d ../in &&
test_expect_success 'absolute pathname outside should fail' '( git ls-files --error-unmatch sub/file
)
rm -fr mine && '
mkdir mine &&
cd mine &&
out=$(pwd) &&
test_create_repo one &&
cd one &&
mkdir sub &&
>sub/file &&
git add sub/file &&
test_must_fail git mv sub "$out/out" &&
test -d sub &&
! test -d ../in &&
git ls-files --error-unmatch sub/file
)'
test_expect_success 'git mv to move multiple sources into a directory' ' test_expect_success 'git mv to move multiple sources into a directory' '
rm -fr .git && git init && rm -fr .git && git init &&
@ -227,23 +228,24 @@ test_expect_success 'git mv to move multiple sources into a directory' '
git add dir/?.txt && git add dir/?.txt &&
git mv dir/a.txt dir/b.txt other && git mv dir/a.txt dir/b.txt other &&
git ls-files >actual && git ls-files >actual &&
{ echo other/a.txt; echo other/b.txt; } >expect && cat >expect <<-\EOF &&
other/a.txt
other/b.txt
EOF
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'git mv should not change sha1 of moved cache entry' ' test_expect_success 'git mv should not change sha1 of moved cache entry' '
rm -fr .git && rm -fr .git &&
git init && git init &&
echo 1 >dirty && echo 1 >dirty &&
git add dirty && git add dirty &&
entry="$(git ls-files --stage dirty | cut -f 1)" && entry="$(git ls-files --stage dirty | cut -f 1)" &&
git mv dirty dirty2 && git mv dirty dirty2 &&
[ "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" ] && test "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" &&
echo 2 >dirty2 && echo 2 >dirty2 &&
git mv dirty2 dirty && git mv dirty2 dirty &&
[ "$entry" = "$(git ls-files --stage dirty | cut -f 1)" ] test "$entry" = "$(git ls-files --stage dirty | cut -f 1)"
' '
rm -f dirty dirty2 rm -f dirty dirty2
@ -266,7 +268,6 @@ test_expect_success 'git mv error on conflicted file' '
' '
test_expect_success 'git mv should overwrite symlink to a file' ' test_expect_success 'git mv should overwrite symlink to a file' '
rm -fr .git && rm -fr .git &&
git init && git init &&
echo 1 >moved && echo 1 >moved &&
@ -279,13 +280,11 @@ test_expect_success 'git mv should overwrite symlink to a file' '
test "$(cat symlink)" = 1 && test "$(cat symlink)" = 1 &&
git update-index --refresh && git update-index --refresh &&
git diff-files --quiet git diff-files --quiet
' '
rm -f moved symlink rm -f moved symlink
test_expect_success 'git mv should overwrite file with a symlink' ' test_expect_success 'git mv should overwrite file with a symlink' '
rm -fr .git && rm -fr .git &&
git init && git init &&
echo 1 >moved && echo 1 >moved &&
@ -296,11 +295,9 @@ test_expect_success 'git mv should overwrite file with a symlink' '
! test -e symlink && ! test -e symlink &&
git update-index --refresh && git update-index --refresh &&
git diff-files --quiet git diff-files --quiet
' '
test_expect_success SYMLINKS 'check moved symlink' ' test_expect_success SYMLINKS 'check moved symlink' '
test -h moved test -h moved
' '
@ -335,11 +332,8 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm
mkdir mod && mkdir mod &&
git mv sub mod/sub && git mv sub mod/sub &&
! test -e sub && ! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] && test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
( git -C mod/sub status &&
cd mod/sub &&
git status
) &&
git update-index --refresh && git update-index --refresh &&
git diff-files --quiet git diff-files --quiet
' '
@ -358,11 +352,8 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
mkdir mod && mkdir mod &&
git mv sub mod/sub && git mv sub mod/sub &&
! test -e sub && ! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] && test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
( git -C mod/sub status &&
cd mod/sub &&
git status
) &&
echo mod/sub >expected && echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual && git config -f .gitmodules submodule.sub.path >actual &&
test_cmp expected actual && test_cmp expected actual &&
@ -376,16 +367,10 @@ test_expect_success 'git mv moves a submodule with gitfile' '
git submodule update && git submodule update &&
entry="$(git ls-files --stage sub | cut -f 1)" && entry="$(git ls-files --stage sub | cut -f 1)" &&
mkdir mod && mkdir mod &&
( git -C mod mv ../sub/ . &&
cd mod &&
git mv ../sub/ .
) &&
! test -e sub && ! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] && test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
( git -C mod/sub status &&
cd mod/sub &&
git status
) &&
echo mod/sub >expected && echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual && git config -f .gitmodules submodule.sub.path >actual &&
test_cmp expected actual && test_cmp expected actual &&
@ -403,11 +388,8 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' '
git mv sub mod/sub 2>actual.err && git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err && test_must_be_empty actual.err &&
! test -e sub && ! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] && test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
( git -C mod/sub status &&
cd mod/sub &&
git status
) &&
git update-index --refresh && git update-index --refresh &&
git diff-files --quiet git diff-files --quiet
' '
@ -427,11 +409,8 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
git mv sub mod/sub 2>actual.err && git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err && test_must_be_empty actual.err &&
! test -e sub && ! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] && test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
( git -C mod/sub status &&
cd mod/sub &&
git status
) &&
git update-index --refresh && git update-index --refresh &&
git diff-files --quiet git diff-files --quiet
' '
@ -448,11 +427,8 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
git mv sub mod/sub 2>actual.err && git mv sub mod/sub 2>actual.err &&
test_cmp expect.err actual.err && test_cmp expect.err actual.err &&
! test -e sub && ! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] && test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
( git -C mod/sub status &&
cd mod/sub &&
git status
) &&
git update-index --refresh && git update-index --refresh &&
git diff-files --quiet git diff-files --quiet
' '
@ -515,15 +491,17 @@ test_expect_success 'moving a submodule in nested directories' '
test_expect_success 'moving nested submodules' ' test_expect_success 'moving nested submodules' '
git commit -am "cleanup commit" && git commit -am "cleanup commit" &&
mkdir sub_nested_nested && mkdir sub_nested_nested &&
(cd sub_nested_nested && (
touch nested_level2 && cd sub_nested_nested &&
>nested_level2 &&
git init && git init &&
git add . && git add . &&
git commit -m "nested level 2" git commit -m "nested level 2"
) && ) &&
mkdir sub_nested && mkdir sub_nested &&
(cd sub_nested && (
touch nested_level1 && cd sub_nested &&
>nested_level1 &&
git init && git init &&
git add . && git add . &&
git commit -m "nested level 1" && git commit -m "nested level 1" &&