Merge branch 'js/checkout-untracked-symlink'

* js/checkout-untracked-symlink: t2021: mark a test as fixed
2011-04-12 00:05:50 -07:00 · 2011-04-12 00:05:50 -07:00 · 9db1941458
parent 5dee1532e1 9973d9329b
commit 9db1941458
1 changed files with 1 additions and 1 deletions
--- a/t/t2021-checkout-overwrite.sh
+++ b/t/t2021-checkout-overwrite.sh
@ -39,7 +39,7 @@ test_expect_success SYMLINKS 'create a commit where dir a/b changed to symlink'
 	git commit -m "dir to symlink"
 '

-test_expect_failure SYMLINKS 'checkout commit with dir must not remove untracked a/b' '
+test_expect_success SYMLINKS 'checkout commit with dir must not remove untracked a/b' '

 	git rm --cached a/b &&
 	git commit -m "un-track the symlink" &&