kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

* js/checkout-untracked-symlink:
  t2021: mark a test as fixed
maint
Junio C Hamano 2011-04-13 13:55:53 -07:00
parent 5fb41b883a 9973d9329b
commit 302de7a685
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t2021-checkout-overwrite.sh
View File

@ -39,7 +39,7 @@ test_expect_success SYMLINKS 'create a commit where dir a/b changed to symlink'
git commit -m "dir 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 rm --cached a/b &&
git commit -m "un-track the symlink" && git commit -m "un-track the symlink" &&