diff --git a/t/t6060-merge-index.sh b/t/t6060-merge-index.sh
index 895f079c92deaba717cc19ec51d3d8bd5b98b98f..debadbd299c02630097a3f476729719d4d71a10c 100755 (executable)
--- a/t/t6060-merge-index.sh
+++ b/t/t6060-merge-index.sh
)
'
)
'
-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 &&
(cd bare.git &&
mkdir work &&
GIT_WORK_TREE=$PWD/work &&
test_cmp expect-merged bare.git/work/file-index
'
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 &&
mkdir subdir &&
git clone . subdir/child &&
(cd subdir &&