From 0e1b50152bfc12d2d286af17993f6356171e9ce5 Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Mon, 23 Aug 2010 16:15:47 -0400 Subject: [PATCH] t7606: Avoid using head as a file name 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 Acked-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- t/t7606-merge-custom.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t7606-merge-custom.sh b/t/t7606-merge-custom.sh index 13c219367..8e8c4d724 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 && -- 2.30.2