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

gitster · gitster · commit 302de7a68595 · 2011-04-13T13:55:53.000-07:00
* js/checkout-untracked-symlink:
  t2021: mark a test as fixed
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" &&

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ test_expect_success SYMLINKS 'create a commit where dir a/b changed to symlink'`
`39`	`39`	`git commit -m "dir to symlink"`
`40`	`40`	`'`
`41`	`41`
`42`		`-test_expect_failure SYMLINKS 'checkout commit with dir must not remove untracked a/b' '`
	`42`	`+test_expect_success SYMLINKS 'checkout commit with dir must not remove untracked a/b' '`
`43`	`43`
`44`	`44`	`git rm --cached a/b &&`
`45`	`45`	`git commit -m "un-track the symlink" &&`