mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ss/t6025-modernize'

Browse Source 
Test style updates.

* ss/t6025-modernize:
  t6025: use helpers to replace test -f <path>
  t6025: modernize style
This commit is contained in:
Junio C Hamano
2020-01-30 14:17:11 -08:00
parent 7050624abc c513a958b6
commit 0d0fa20c40
1 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
t/t6025-merge-symlinks.sh
View File

@ -10,8 +10,7 @@ if core.symlinks is false.'
. ./test-lib.sh . ./test-lib.sh
test_expect_success \ test_expect_success 'setup' '
'setup' '
git config core.symlinks false && git config core.symlinks false &&
>file && >file &&
git add file && git add file &&
@ -28,34 +27,36 @@ git commit -m b-symlink &&
git checkout b-file && git checkout b-file &&
echo plain-file >symlink && echo plain-file >symlink &&
git add symlink && git add symlink &&
git commit -m b-file' git commit -m b-file
'
test_expect_success \ test_expect_success 'merge master into b-symlink, which has a different symbolic link' '
'merge master into b-symlink, which has a different symbolic link' '
git checkout b-symlink && git checkout b-symlink &&
test_must_fail git merge master' test_must_fail git merge master
'
test_expect_success \ test_expect_success 'the merge result must be a file' '
'the merge result must be a file' ' test_path_is_file symlink
test -f symlink' '
test_expect_success \ test_expect_success 'merge master into b-file, which has a file instead of a symbolic link' '
'merge master into b-file, which has a file instead of a symbolic link' ' git reset --hard &&
git reset --hard && git checkout b-file && git checkout b-file &&
test_must_fail git merge master' test_must_fail git merge master
'
test_expect_success \ test_expect_success 'the merge result must be a file' '
'the merge result must be a file' ' test_path_is_file symlink
test -f symlink' '
test_expect_success \ test_expect_success 'merge b-file, which has a file instead of a symbolic link, into master' '
'merge b-file, which has a file instead of a symbolic link, into master' '
git reset --hard && git reset --hard &&
git checkout master && git checkout master &&
test_must_fail git merge b-file' test_must_fail git merge b-file
'
test_expect_success \ test_expect_success 'the merge result must be a file' '
'the merge result must be a file' ' test_path_is_file symlink
test -f symlink' '
test_done test_done