# [PATCH] t7606: Avoid using head as a file name 2 messages from 2010-08-23 to 2010-08-23. Participants: Brian Gernhardt, Jonathan Nieder. Thread: https://gitlist.dev/t/24839 ## Brian Gernhardt, 2010-08-23 20:15 Subject: [PATCH] t7606: Avoid using head as a file name Message-ID: <1282594547-78944-1-git-send-email-brian@gernhardtsoftware.com> URL: https://gitlist.dev/e/1282594547-78944-1-git-send-email-brian%40gernhardtsoftware.com ``` A file named 'head' gets confused with the HEAD ref on case-insensitive file systems. Replace '>head' with '>head.new' to match the '>head.old' files they are compared to. Signed-off-by: Brian Gernhardt --- t/t7606-merge-custom.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t7606-merge-custom.sh b/t/t7606-merge-custom.sh index 13c2193..8e8c4d7 100755 --- a/t/t7606-merge-custom.sh +++ b/t/t7606-merge-custom.sh @@ -46,7 +46,7 @@ test_expect_success 'merge c2 with a custom strategy' ' git rev-parse c2^{tree} >tree.expected && git merge -s theirs c2 && - git rev-parse HEAD >head && + git rev-parse HEAD >head.new && git rev-parse HEAD^1 >first-parent && git rev-parse HEAD^2 >second-parent && git rev-parse HEAD^{tree} >tree && @@ -55,7 +55,7 @@ test_expect_success 'merge c2 with a custom strategy' ' git diff --exit-code c2 HEAD && git diff --exit-code c2 && - ! test_cmp head.old head && + ! test_cmp head.old head.new && test_cmp head.old first-parent && test_cmp second-parent.expected second-parent && test_cmp tree.expected tree && @@ -72,7 +72,7 @@ test_expect_success 'trivial merge with custom strategy' ' git rev-parse c3^{tree} >tree.expected && git merge -s theirs c3 && - git rev-parse HEAD >head && + git rev-parse HEAD >head.new && git rev-parse HEAD^1 >first-parent && git rev-parse HEAD^2 >second-parent && git rev-parse HEAD^{tree} >tree && @@ -81,7 +81,7 @@ test_expect_success 'trivial merge with custom strategy' ' git diff --exit-code c3 HEAD && git diff --exit-code c3 && - ! test_cmp head.old head && + ! test_cmp head.old head.new && test_cmp head.old first-parent && test_cmp second-parent.expected second-parent && test_cmp tree.expected tree && -- 1.7.2.2.399.g628fd ``` ## Jonathan Nieder, 2010-08-23 20:27 Subject: Re: [PATCH] t7606: Avoid using head as a file name Message-ID: <20100823202737.GC2120@burratino> URL: https://gitlist.dev/e/20100823202737.GC2120%40burratino In-Reply-To: <1282594547-78944-1-git-send-email-brian@gernhardtsoftware.com> ``` Brian Gernhardt wrote: > A file named 'head' gets confused with the HEAD ref on > case-insensitive file systems. Replace '>head' with '>head.new' to > match the '>head.old' files they are compared to. Ok. (Thanks for the catch.) Acked-by: Jonathan Nieder ```