Skip to content

Commit

Permalink
Merge branch 'sb/checkout-test-complex-path'
Browse files Browse the repository at this point in the history
* sb/checkout-test-complex-path:
  checkout test: enable test with complex relative path
  • Loading branch information
Jonathan Nieder committed Oct 14, 2013
2 parents 0e3b378 + b0afc02 commit 774282d
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions t/t2008-checkout-subdir.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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' '
rm file1 &&
git checkout HEAD -- ../dir1/../dir1/file1 && test -f ./file1
test_expect_success 'checkout with complex relative path' '
(
cd dir1 &&
rm file1 &&
git checkout HEAD -- ../dir1/../dir1/file1 &&
test "hello" = "$(cat file1)"
)
'

test_expect_success 'relative path outside tree should fail' \
Expand Down

0 comments on commit 774282d

Please sign in to comment.