diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2013-10-14 11:09:30 -0700 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-10-14 11:09:30 -0700 |
| commit | 774282d16ab5aa2ec4b8bb7fa4ad83b0622ee778 (patch) | |
| tree | 9f30c5c347f486237eea76851f373db673c35cc3 | |
| parent | Merge branch 'rt/cherry-pick-status' (diff) | |
| parent | checkout test: enable test with complex relative path (diff) | |
| download | tgif-774282d16ab5aa2ec4b8bb7fa4ad83b0622ee778.tar.xz | |
Merge branch 'sb/checkout-test-complex-path'
* sb/checkout-test-complex-path:
checkout test: enable test with complex relative path
| -rwxr-xr-x | t/t2008-checkout-subdir.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/t/t2008-checkout-subdir.sh b/t/t2008-checkout-subdir.sh index 3e098ab31e..eadb9434ae 100755 --- a/t/t2008-checkout-subdir.sh +++ b/t/t2008-checkout-subdir.sh @@ -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' \ |