Merge branch 'sb/checkout-test-complex-path'

* sb/checkout-test-complex-path:
  checkout test: enable test with complex relative path
This commit is contained in:
Jonathan Nieder 2013-10-14 11:09:30 -07:00
commit 774282d16a

View File

@ -58,13 +58,13 @@ test_expect_success 'checkout with simple prefix' '
'
# This is not expected to work as ls-files was not designed
# to deal with such. Enable it when ls-files is updated.
: test_expect_success 'checkout with complex relative path' '
test_expect_success 'checkout with complex relative path' '
(
cd dir1 &&
rm file1 &&
git checkout HEAD -- ../dir1/../dir1/file1 && test -f ./file1
git checkout HEAD -- ../dir1/../dir1/file1 &&
test "hello" = "$(cat file1)"
)
'
test_expect_success 'relative path outside tree should fail' \