{"thread":{"id":"10647","subject":"[PATCH] t3502: Disambiguate between file and rev by adding --","startedAt":"2007-11-04T15:31:26Z","lastAt":"2007-11-06T01:20:11Z","messageCount":4,"participants":["Brian Gernhardt","Alex Riesen","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"58281","messageId":"20071104153126.GA61398@173.242.249.10.in-addr.arpa","threadId":"10647","inReplyTo":null,"subject":"[PATCH] t3502: Disambiguate between file and rev by adding --","fromName":"Brian Gernhardt","fromEmail":"benji@silverinsanity.com","sentAt":"2007-11-04T15:31:26Z","receivedAt":"2007-11-04T15:31:26Z","isPatch":true,"sender":{"key":"benji@silverinsanity.com","avatar":"https://gravatar.com/avatar/e06c101dbc25c68114d859b4a9ec7cf8a2c52fd2b0270ef0eac0e2e63ff22311?d=mp&s=160"},"body":"This test failed because git-diff didn't know if it was asking for the\nfile \"a\" or the branch \"a\". Adding \"--\" at the end of the ambiguous\ncommands allows the test to finish properly.\n\nSigned-off-by: Brian Gernhardt \n---\n t/t3502-cherry-pick-merge.sh | 8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/t/t3502-cherry-pick-merge.sh b/t/t3502-cherry-pick-merge.sh\nindex 3274c61..7c92e26 100755\n--- a/t/t3502-cherry-pick-merge.sh\n+++ b/t/t3502-cherry-pick-merge.sh\n@@ -36,7 +36,7 @@ test_expect_success 'cherry-pick a non-merge with -m should fail' '\n \tgit reset --hard &&\n \tgit checkout a^0 &&\n \t! git cherry-pick -m 1 b &&\n-\tgit diff --exit-code a\n+\tgit diff --exit-code a --\n \n '\n \n@@ -45,7 +45,7 @@ test_expect_success 'cherry pick a merge without -m should fail' '\n \tgit reset --hard &&\n \tgit checkout a^0 &&\n \t! git cherry-pick c &&\n-\tgit diff --exit-code a\n+\tgit diff --exit-code a --\n \n '\n \n@@ -98,7 +98,7 @@ test_expect_success 'revert a merge (1)' '\n \tgit reset --hard &&\n \tgit checkout c^0 &&\n \tgit revert -m 1 c &&\n-\tgit diff --exit-code a\n+\tgit diff --exit-code a --\n \n '\n \n@@ -107,7 +107,7 @@ test_expect_success 'revert a merge (2)' '\n \tgit reset --hard &&\n \tgit checkout c^0 &&\n \tgit revert -m 2 c &&\n-\tgit diff --exit-code b\n+\tgit diff --exit-code b --\n \n '\n \n-- \n1.5.3.5.530.gcd7a\n"},{"id":"58436","messageId":"20071105222530.GA4208@steel.home","threadId":"10647","inReplyTo":"20071104153126.GA61398@173.242.249.10.in-addr.arpa","subject":"Re: [PATCH] t3502: Disambiguate between file and rev by adding --","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-11-05T22:25:30Z","receivedAt":"2007-11-05T22:25:30Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"Brian Gernhardt, Sun, Nov 04, 2007 16:31:26 +0100:\n> This test failed because git-diff didn't know if it was asking for the\n> file \"a\" or the branch \"a\". Adding \"--\" at the end of the ambiguous\n> commands allows the test to finish properly.\n\nTo be precise: this is ambiguous only on case-challenged filesystems\n"},{"id":"58472","messageId":"2DC3CFEE-ACA0-448F-9957-EB98F299D812@silverinsanity.com","threadId":"10647","inReplyTo":"20071105222530.GA4208@steel.home","subject":"Re: [PATCH] t3502: Disambiguate between file and rev by adding --","fromName":"Brian Gernhardt","fromEmail":"benji@silverinsanity.com","sentAt":"2007-11-06T01:17:27Z","receivedAt":"2007-11-06T01:17:27Z","isPatch":true,"sender":{"key":"benji@silverinsanity.com","avatar":"https://gravatar.com/avatar/e06c101dbc25c68114d859b4a9ec7cf8a2c52fd2b0270ef0eac0e2e63ff22311?d=mp&s=160"},"body":"\nOn Nov 5, 2007, at 5:25 PM, Alex Riesen wrote:\n\n> Brian Gernhardt, Sun, Nov 04, 2007 16:31:26 +0100:\n>> This test failed because git-diff didn't know if it was asking for \n>> the\n>> file \"a\" or the branch \"a\". Adding \"--\" at the end of the ambiguous\n>> commands allows the test to finish properly.\n>\n> To be precise: this is ambiguous only on case-challenged filesystems\n\nOh. I just saw the ambiguous error. Should I re-post with a more \ncorrect commit message?\n\n~~B\n"},{"id":"58473","messageId":"7vabpskw50.fsf@gitster.siamese.dyndns.org","threadId":"10647","inReplyTo":"2DC3CFEE-ACA0-448F-9957-EB98F299D812@silverinsanity.com","subject":"Re: [PATCH] t3502: Disambiguate between file and rev by adding --","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-11-06T01:20:11Z","receivedAt":"2007-11-06T01:20:11Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Brian Gernhardt writes:\n\n> On Nov 5, 2007, at 5:25 PM, Alex Riesen wrote:\n>\n>> Brian Gernhardt, Sun, Nov 04, 2007 16:31:26 +0100:\n>>> This test failed because git-diff didn't know if it was asking for\n>>> the\n>>> file \"a\" or the branch \"a\". Adding \"--\" at the end of the ambiguous\n>>> commands allows the test to finish properly.\n>>\n>> To be precise: this is ambiguous only on case-challenged filesystems\n>\n> Oh. I just saw the ambiguous error. Should I re-post with a more\n> correct commit message?\n\nThis is what I wrote but haven't pushed out (I will have to tend\nother topics first):\n\ncommit 9f12bec4386fc96e5b617268822cbb75e4c76101\nAuthor: Brian Gernhardt \nDate: Sun Nov 4 10:31:26 2007 -0500\n\n t3502: Disambiguate between file and rev by adding --\n \n On a case insensitive file system, this test fails because git-diff\n doesn't know if it is asking for the file \"A\" or the tag \"a\".\n \n Adding \"--\" at the end of the ambiguous commands allows the test to\n finish properly.\n \n Signed-off-by: Brian Gernhardt \n Signed-off-by: Junio C Hamano \n"}]}