{"thread":{"id":"35090","subject":"[PATCH] checkout tests: enable test with complex relative path","startedAt":"2013-10-09T14:35:11Z","lastAt":"2013-10-10T17:54:28Z","messageCount":4,"participants":["Stefan Beller","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"228645","messageId":"1381329311-5920-1-git-send-email-stefanbeller@googlemail.com","threadId":"35090","inReplyTo":null,"subject":"[PATCH] checkout tests: enable test with complex relative path","fromName":"Stefan Beller","fromEmail":"stefanbeller@googlemail.com","sentAt":"2013-10-09T14:35:11Z","receivedAt":"2013-10-09T14:35:11Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"This test was put in, but commented out in fed1b5ca (2007-11-09,\ngit-checkout: Test for relative path use.)\nIt's been a while since 2007 and the intended test case works now.\n(I could not find the enabling commit in ls-files however.)\n\nThe code in question however did not change into the sub directory,\nso we still need to add a 'cd'. Also a test for the file content has been\nadded. This is already part of the other tests for checkout.\n\nSigned-off-by: Stefan Beller <stefanbeller@googlemail.com>\n---\n t/t2008-checkout-subdir.sh | 15 ++++++++-------\n 1 file changed, 8 insertions(+), 7 deletions(-)\n\ndiff --git a/t/t2008-checkout-subdir.sh b/t/t2008-checkout-subdir.sh\nindex 3e098ab..399655f 100755\n--- a/t/t2008-checkout-subdir.sh\n+++ b/t/t2008-checkout-subdir.sh\n@@ -58,13 +58,14 @@ test_expect_success 'checkout with simple prefix' '\n \n '\n \n-# This is not expected to work as ls-files was not designed\n-# to deal with such.  Enable it when ls-files is updated.\n-: test_expect_success 'checkout with complex relative path' '\n-\n-\trm file1 &&\n-\tgit checkout HEAD -- ../dir1/../dir1/file1 && test -f ./file1\n-\n+test_expect_success 'checkout with complex relative path' '\n+\t(\n+\t\tcd dir1 &&\n+\t\trm file1 &&\n+\t\tgit checkout HEAD -- ../dir1/../dir1/file1 &&\n+\t\ttest -f file1 &&\n+\t\ttest \"hello\" = \"$(cat file1)\"\n+\t)\n '\n \n test_expect_success 'relative path outside tree should fail' \\\n-- \n1.8.4.1.471.g53f64e4.dirty\n"},{"id":"228672","messageId":"20131009193952.GL9464@google.com","threadId":"35090","inReplyTo":"1381329311-5920-1-git-send-email-stefanbeller@googlemail.com","subject":"Re: [PATCH] checkout tests: enable test with complex relative path","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-10-09T19:39:53Z","receivedAt":"2013-10-09T19:39:53Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Stefan Beller wrote:\n\n> This test was put in, but commented out in fed1b5ca (2007-11-09,\n> git-checkout: Test for relative path use.)\n> It's been a while since 2007 and the intended test case works now.\n> (I could not find the enabling commit in ls-files however.)\n\nBisects to v1.5.5-rc0~184^2~3 (setup: sanitize absolute and funny paths\nin get_pathspec(), 2008-01-28).  Thanks.\n"},{"id":"228689","messageId":"52565F96.8010809@googlemail.com","threadId":"35090","inReplyTo":"20131009193952.GL9464@google.com","subject":"Re: [PATCH] checkout tests: enable test with complex relative path","fromName":"Stefan Beller","fromEmail":"stefanbeller@googlemail.com","sentAt":"2013-10-10T08:04:38Z","receivedAt":"2013-10-10T08:04:38Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On 10/09/2013 09:39 PM, Jonathan Nieder wrote:\n> Stefan Beller wrote:\n> \n>> This test was put in, but commented out in fed1b5ca (2007-11-09,\n>> git-checkout: Test for relative path use.)\n>> It's been a while since 2007 and the intended test case works now.\n>> (I could not find the enabling commit in ls-files however.)\n> \n> Bisects to v1.5.5-rc0~184^2~3 (setup: sanitize absolute and funny paths\n> in get_pathspec(), 2008-01-28).  Thanks.\n> \n\nDo you want me to resend a reworded patch, or could you amend that\ninformation to this patch?\n"},{"id":"228704","messageId":"20131010175428.GN9464@google.com","threadId":"35090","inReplyTo":"52565F96.8010809@googlemail.com","subject":"Re: [PATCH] checkout tests: enable test with complex relative path","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-10-10T17:54:28Z","receivedAt":"2013-10-10T17:54:28Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Stefan Beller wrote:\n> On 10/09/2013 09:39 PM, Jonathan Nieder wrote:\n>> Stefan Beller wrote:\n\n>>> This test was put in, but commented out in fed1b5ca (2007-11-09,\n>>> git-checkout: Test for relative path use.)\n>>> It's been a while since 2007 and the intended test case works now.\n>>> (I could not find the enabling commit in ls-files however.)\n>>\n>> Bisects to v1.5.5-rc0~184^2~3 (setup: sanitize absolute and funny paths\n>> in get_pathspec(), 2008-01-28).  Thanks.\n>\n> Do you want me to resend a reworded patch, or could you amend that\n> information to this patch?\n\nAdded locally, along with a couple of other nits.  Will push out soon,\nand then a sanity check on the result would be much appreciated.\n"}]}