diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3509-cherry-pick-merge-df.sh | 4 | ||||
| -rwxr-xr-x | t/t9350-fast-export.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t3509-cherry-pick-merge-df.sh b/t/t3509-cherry-pick-merge-df.sh index 6e7ef8483f..a5ccdbf8fc 100755 --- a/t/t3509-cherry-pick-merge-df.sh +++ b/t/t3509-cherry-pick-merge-df.sh @@ -3,7 +3,7 @@ test_description='Test cherry-pick with directory/file conflicts' . ./test-lib.sh -test_expect_success 'Setup rename across paths each below D/F conflicts' ' +test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' ' mkdir a && >a/f && git add a && @@ -26,7 +26,7 @@ test_expect_success 'Setup rename across paths each below D/F conflicts' ' git commit -m f1 ' -test_expect_success 'Cherry-pick succeeds with rename across D/F conflicts' ' +test_expect_success SYMLINKS 'Cherry-pick succeeds with rename across D/F conflicts' ' git reset --hard && git checkout master^0 && git cherry-pick branch diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh index 1ee1461c9b..27aea5c165 100755 --- a/t/t9350-fast-export.sh +++ b/t/t9350-fast-export.sh @@ -376,7 +376,7 @@ test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj' test_expect_success 'tag-obj_tag' 'git fast-export tag-obj_tag' test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj' -test_expect_success 'directory becomes symlink' ' +test_expect_success SYMLINKS 'directory becomes symlink' ' git init dirtosymlink && git init result && ( |