t6035: use test_ln_s_add to remove SYMLINKS prerequisite

All tests in t6035 are protected by SYMLINKS. But that is not necessary,
because a lot of the functionality can be tested provided symbolic link
entries enter the index and object data base. Use test_ln_s_add for this
purpose.

Some test cases do test the presence of symbolic links on the file system.
Move these tests into separate test cases that remain protected by
SYMLINKS.

There is one instance of expect_failure. There is a possibility that this
test case fails differently depending on whether SYMLINKS is present or
not; but this is not the case.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh
index 2599ae50eb94051f66b4dc1de603aaf8cd1f79eb..9324ea44162130c0eea4dcc08d21866354e3c1da 100755 (executable)
--- a/t/t6035-merge-dir-to-symlink.sh
+++ b/t/t6035-merge-dir-to-symlink.sh
@@ -3,7 +3,7 @@
 test_description='merging when a directory was replaced with a symlink'
 . ./test-lib.sh
 
 test_description='merging when a directory was replaced with a symlink'
 . ./test-lib.sh
 

-test_expect_success SYMLINKS 'create a commit where dir a/b changed to symlink' '
+test_expect_success 'create a commit where dir a/b changed to symlink' '

        mkdir -p a/b/c a/b-2/c &&
        > a/b/c/d &&
        > a/b-2/c/d &&
        mkdir -p a/b/c a/b-2/c &&
        > a/b/c/d &&
        > a/b-2/c/d &&


@@ -12,12 +12,12 @@ test_expect_success SYMLINKS 'create a commit where dir a/b changed to symlink'
        git commit -m base &&
        git tag start &&
        rm -rf a/b &&
        git commit -m base &&
        git tag start &&
        rm -rf a/b &&

-       ln -s b-2 a/b &&

        git add -A &&
        git add -A &&

+       test_ln_s_add b-2 a/b &&

        git commit -m "dir to symlink"
 '
 
        git commit -m "dir to symlink"
 '
 

-test_expect_success SYMLINKS 'checkout does not clobber untracked symlink' '
+test_expect_success 'checkout does not clobber untracked symlink' '

        git checkout HEAD^0 &&
        git reset --hard master &&
        git rm --cached a/b &&
        git checkout HEAD^0 &&
        git reset --hard master &&
        git rm --cached a/b &&


@@ -25,7 +25,7 @@ test_expect_success SYMLINKS 'checkout does not clobber untracked symlink' '
        test_must_fail git checkout start^0
 '
 
        test_must_fail git checkout start^0
 '
 

-test_expect_success SYMLINKS 'a/b-2/c/d is kept when clobbering symlink b' '
+test_expect_success 'a/b-2/c/d is kept when clobbering symlink b' '

        git checkout HEAD^0 &&
        git reset --hard master &&
        git rm --cached a/b &&
        git checkout HEAD^0 &&
        git reset --hard master &&
        git rm --cached a/b &&


@@ -34,14 +34,14 @@ test_expect_success SYMLINKS 'a/b-2/c/d is kept when clobbering symlink b' '
        test -f a/b-2/c/d
 '
 
        test -f a/b-2/c/d
 '
 

-test_expect_success SYMLINKS 'checkout should not have deleted a/b-2/c/d' '
+test_expect_success 'checkout should not have deleted a/b-2/c/d' '

        git checkout HEAD^0 &&
        git reset --hard master &&
         git checkout start^0 &&
         test -f a/b-2/c/d
 '
 
        git checkout HEAD^0 &&
        git reset --hard master &&
         git checkout start^0 &&
         test -f a/b-2/c/d
 '
 

-test_expect_success SYMLINKS 'setup for merge test' '
+test_expect_success 'setup for merge test' '

        git reset --hard &&
        test -f a/b-2/c/d &&
        echo x > a/x &&
        git reset --hard &&
        test -f a/b-2/c/d &&
        echo x > a/x &&


@@ -50,39 +50,51 @@ test_expect_success SYMLINKS 'setup for merge test' '
        git tag baseline
 '
 
        git tag baseline
 '
 

-test_expect_success SYMLINKS 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)' '
+test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)' '

        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s resolve master &&
        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s resolve master &&

-       test -h a/b &&

        test -f a/b-2/c/d
 '
 
        test -f a/b-2/c/d
 '
 

-test_expect_success SYMLINKS 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)' '
+test_expect_success SYMLINKS 'a/b was resolved as symlink' '
+       test -h a/b
+'
+
+test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)' '

        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s recursive master &&
        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s recursive master &&

-       test -h a/b &&

        test -f a/b-2/c/d
 '
 
        test -f a/b-2/c/d
 '
 

-test_expect_success SYMLINKS 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)' '
+test_expect_success SYMLINKS 'a/b was resolved as symlink' '
+       test -h a/b
+'
+
+test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)' '

        git reset --hard &&
        git checkout master^0 &&
        git merge -s resolve baseline^0 &&
        git reset --hard &&
        git checkout master^0 &&
        git merge -s resolve baseline^0 &&

-       test -h a/b &&

        test -f a/b-2/c/d
 '
 
        test -f a/b-2/c/d
 '
 

-test_expect_success SYMLINKS 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' '
+test_expect_success SYMLINKS 'a/b was resolved as symlink' '
+       test -h a/b
+'
+
+test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' '

        git reset --hard &&
        git checkout master^0 &&
        git merge -s recursive baseline^0 &&
        git reset --hard &&
        git checkout master^0 &&
        git merge -s recursive baseline^0 &&

-       test -h a/b &&

        test -f a/b-2/c/d
 '
 
        test -f a/b-2/c/d
 '
 

-test_expect_failure SYMLINKS 'do not lose untracked in merge (resolve)' '
+test_expect_success SYMLINKS 'a/b was resolved as symlink' '
+       test -h a/b
+'
+
+test_expect_failure 'do not lose untracked in merge (resolve)' '

        git reset --hard &&
        git checkout baseline^0 &&
        >a/b/c/e &&
        git reset --hard &&
        git checkout baseline^0 &&
        >a/b/c/e &&


@@ -91,7 +103,7 @@ test_expect_failure SYMLINKS 'do not lose untracked in merge (resolve)' '
        test -f a/b-2/c/d
 '
 
        test -f a/b-2/c/d
 '
 

-test_expect_success SYMLINKS 'do not lose untracked in merge (recursive)' '
+test_expect_success 'do not lose untracked in merge (recursive)' '

        git reset --hard &&
        git checkout baseline^0 &&
        >a/b/c/e &&
        git reset --hard &&
        git checkout baseline^0 &&
        >a/b/c/e &&


@@ -100,52 +112,61 @@ test_expect_success SYMLINKS 'do not lose untracked in merge (recursive)' '
        test -f a/b-2/c/d
 '
 
        test -f a/b-2/c/d
 '
 

-test_expect_success SYMLINKS 'do not lose modifications in merge (resolve)' '
+test_expect_success 'do not lose modifications in merge (resolve)' '

        git reset --hard &&
        git checkout baseline^0 &&
        echo more content >>a/b/c/d &&
        test_must_fail git merge -s resolve master
 '
 
        git reset --hard &&
        git checkout baseline^0 &&
        echo more content >>a/b/c/d &&
        test_must_fail git merge -s resolve master
 '
 

-test_expect_success SYMLINKS 'do not lose modifications in merge (recursive)' '
+test_expect_success 'do not lose modifications in merge (recursive)' '

        git reset --hard &&
        git checkout baseline^0 &&
        echo more content >>a/b/c/d &&
        test_must_fail git merge -s recursive master
 '
 
        git reset --hard &&
        git checkout baseline^0 &&
        echo more content >>a/b/c/d &&
        test_must_fail git merge -s recursive master
 '
 

-test_expect_success SYMLINKS 'setup a merge where dir a/b-2 changed to symlink' '
+test_expect_success 'setup a merge where dir a/b-2 changed to symlink' '

        git reset --hard &&
        git checkout start^0 &&
        rm -rf a/b-2 &&
        git reset --hard &&
        git checkout start^0 &&
        rm -rf a/b-2 &&

-       ln -s b a/b-2 &&

        git add -A &&
        git add -A &&

+       test_ln_s_add b a/b-2 &&

        git commit -m "dir a/b-2 to symlink" &&
        git tag test2
 '
 
        git commit -m "dir a/b-2 to symlink" &&
        git tag test2
 '
 

-test_expect_success SYMLINKS 'merge should not have D/F conflicts (resolve)' '
+test_expect_success 'merge should not have D/F conflicts (resolve)' '

        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s resolve test2 &&
        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s resolve test2 &&

-       test -h a/b-2 &&

        test -f a/b/c/d
 '
 
        test -f a/b/c/d
 '
 

-test_expect_success SYMLINKS 'merge should not have D/F conflicts (recursive)' '
+test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
+       test -h a/b-2
+'
+
+test_expect_success 'merge should not have D/F conflicts (recursive)' '

        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s recursive test2 &&
        git reset --hard &&
        git checkout baseline^0 &&
        git merge -s recursive test2 &&

-       test -h a/b-2 &&

        test -f a/b/c/d
 '
 
        test -f a/b/c/d
 '
 

-test_expect_success SYMLINKS 'merge should not have F/D conflicts (recursive)' '
+test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
+       test -h a/b-2
+'
+
+test_expect_success 'merge should not have F/D conflicts (recursive)' '

        git reset --hard &&
        git checkout -b foo test2 &&
        git merge -s recursive baseline^0 &&
        git reset --hard &&
        git checkout -b foo test2 &&
        git merge -s recursive baseline^0 &&

-       test -h a/b-2 &&

        test -f a/b/c/d
 '
 
        test -f a/b/c/d
 '
 

+test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
+       test -h a/b-2
+'
+

 test_done
 test_done