Fourth batch

diff --git a/t/t6060-merge-index.sh b/t/t6060-merge-index.sh
index 895f079c92deaba717cc19ec51d3d8bd5b98b98f..ddf34f0115b08b401a8981099459d10e1b1c4a02 100755 (executable)
--- a/t/t6060-merge-index.sh
+++ b/t/t6060-merge-index.sh
@@ -44,8 +44,7 @@ test_expect_success 'read-tree does not resolve content merge' '
 test_expect_success 'git merge-index git-merge-one-file resolves' '
        git merge-index git-merge-one-file -a &&
        git diff-files --name-only --diff-filter=U >unmerged &&
-       >expect &&
-       test_cmp expect unmerged &&
+       test_must_be_empty unmerged &&
        test_cmp expect-merged file &&
        git cat-file blob :file >file-index &&
        test_cmp expect-merged file-index
@@ -68,7 +67,7 @@ test_expect_success 'merge-one-file fails without a work tree' '
        )
 '
 
-test_expect_failure 'merge-one-file respects GIT_WORK_TREE' '
+test_expect_success 'merge-one-file respects GIT_WORK_TREE' '
        (cd bare.git &&
         mkdir work &&
         GIT_WORK_TREE=$PWD/work &&
@@ -82,7 +81,7 @@ test_expect_failure 'merge-one-file respects GIT_WORK_TREE' '
        test_cmp expect-merged bare.git/work/file-index
 '
 
-test_expect_failure 'merge-one-file respects core.worktree' '
+test_expect_success 'merge-one-file respects core.worktree' '
        mkdir subdir &&
        git clone . subdir/child &&
        (cd subdir &&