{"thread":{"id":"24839","subject":"[PATCH] t7606: Avoid using head as a file name","startedAt":"2010-08-23T20:15:47Z","lastAt":"2010-08-23T20:27:37Z","messageCount":2,"participants":["Brian Gernhardt","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"148776","messageId":"1282594547-78944-1-git-send-email-brian@gernhardtsoftware.com","threadId":"24839","inReplyTo":null,"subject":"[PATCH] t7606: Avoid using head as a file name","fromName":"Brian Gernhardt","fromEmail":"brian@gernhardtsoftware.com","sentAt":"2010-08-23T20:15:47Z","receivedAt":"2010-08-23T20:15:47Z","isPatch":true,"sender":{"key":"brian@gernhardtsoftware.com","avatar":"https://avatars.githubusercontent.com/u/133455?v=4"},"body":"A file named 'head' gets confused with the HEAD ref on\ncase-insensitive file systems.  Replace '>head' with '>head.new' to\nmatch the '>head.old' files they are compared to.\n\nSigned-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>\n---\n t/t7606-merge-custom.sh |    8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/t/t7606-merge-custom.sh b/t/t7606-merge-custom.sh\nindex 13c2193..8e8c4d7 100755\n--- a/t/t7606-merge-custom.sh\n+++ b/t/t7606-merge-custom.sh\n@@ -46,7 +46,7 @@ test_expect_success 'merge c2 with a custom strategy' '\n \tgit rev-parse c2^{tree} >tree.expected &&\n \tgit merge -s theirs c2 &&\n \n-\tgit rev-parse HEAD >head &&\n+\tgit rev-parse HEAD >head.new &&\n \tgit rev-parse HEAD^1 >first-parent &&\n \tgit rev-parse HEAD^2 >second-parent &&\n \tgit rev-parse HEAD^{tree} >tree &&\n@@ -55,7 +55,7 @@ test_expect_success 'merge c2 with a custom strategy' '\n \tgit diff --exit-code c2 HEAD &&\n \tgit diff --exit-code c2 &&\n \n-\t! test_cmp head.old head &&\n+\t! test_cmp head.old head.new &&\n \ttest_cmp head.old first-parent &&\n \ttest_cmp second-parent.expected second-parent &&\n \ttest_cmp tree.expected tree &&\n@@ -72,7 +72,7 @@ test_expect_success 'trivial merge with custom strategy' '\n \tgit rev-parse c3^{tree} >tree.expected &&\n \tgit merge -s theirs c3 &&\n \n-\tgit rev-parse HEAD >head &&\n+\tgit rev-parse HEAD >head.new &&\n \tgit rev-parse HEAD^1 >first-parent &&\n \tgit rev-parse HEAD^2 >second-parent &&\n \tgit rev-parse HEAD^{tree} >tree &&\n@@ -81,7 +81,7 @@ test_expect_success 'trivial merge with custom strategy' '\n \tgit diff --exit-code c3 HEAD &&\n \tgit diff --exit-code c3 &&\n \n-\t! test_cmp head.old head &&\n+\t! test_cmp head.old head.new &&\n \ttest_cmp head.old first-parent &&\n \ttest_cmp second-parent.expected second-parent &&\n \ttest_cmp tree.expected tree &&\n-- \n1.7.2.2.399.g628fd\n"},{"id":"148780","messageId":"20100823202737.GC2120@burratino","threadId":"24839","inReplyTo":"1282594547-78944-1-git-send-email-brian@gernhardtsoftware.com","subject":"Re: [PATCH] t7606: Avoid using head as a file name","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-23T20:27:37Z","receivedAt":"2010-08-23T20:27:37Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Brian Gernhardt wrote:\n\n> A file named 'head' gets confused with the HEAD ref on\n> case-insensitive file systems.  Replace '>head' with '>head.new' to\n> match the '>head.old' files they are compared to.\n\nOk.  (Thanks for the catch.)\n\nAcked-by: Jonathan Nieder <jrnieder@gmail.com>\n"}]}