Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
check_path(): allow symlinked directories to checkout-index --prefix
[gitweb.git]
/
t
/
t6035-merge-dir-to-symlink.sh
diff --git
a/t/t6035-merge-dir-to-symlink.sh
b/t/t6035-merge-dir-to-symlink.sh
index ba90fc53e0447e632aa77702f20e793d765da540..a0ddf1e0f4013d1adba97561b5b692da7010383f 100755
(executable)
--- a/
t/t6035-merge-dir-to-symlink.sh
+++ b/
t/t6035-merge-dir-to-symlink.sh
@@
-17,7
+17,7
@@
test_expect_success 'create a commit where dir a/b changed to symlink' '
git commit -m "dir to symlink"
'
-test_expect_
failure
'keep a/b-2/c/d across checkout' '
+test_expect_
success
'keep a/b-2/c/d across checkout' '
git checkout HEAD^0 &&
git reset --hard master &&
git rm --cached a/b &&