global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 02:13:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'en/d-f-conflict-fix' into next

Browse Source 
* en/d-f-conflict-fix:
  Mark tests that use symlinks as needing SYMLINKS prerequisite
This commit is contained in:
Junio C Hamano
2010-08-14 14:59:19 -07:00
parent ffe84bbc1f dd5685818b
commit 1c9b0f5cae
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t3509-cherry-pick-merge-df.sh
View File

@@ -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

2
t/t9350-fast-export.sh
View File

@@ -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 &&
(