Merge branch 'js/checkout-untracked-symlink' into maint

* js/checkout-untracked-symlink: t2021: mark a test as fixed
git-mirror · Apr 13, 2011 · 302de7a · 302de7a
2 parents 5fb41b8 + 9973d93
commit 302de7a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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" &&