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 <brian@gernhardtsoftware.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brian Gernhardt committed
Aug 23, 2010 at 16:15 UTC
0e1b50152bfc12d2d286af17993f6356171e9ce5
1 file changed
+4
-4
t/t7606-merge-custom.sh
+4
-4
@@ -46,7 +46,7 @@ test_expect_success 'merge c2 with a custom strategy' '
46
git rev-parse c2^{tree} >tree.expected &&
47
git merge -s theirs c2 &&
48
49
- git rev-parse HEAD >head &&
49
+ git rev-parse HEAD >head.new &&
50
git rev-parse HEAD^1 >first-parent &&
51
git rev-parse HEAD^2 >second-parent &&
52
git rev-parse HEAD^{tree} >tree &&
@@ -55,7 +55,7 @@ test_expect_success 'merge c2 with a custom strategy' '
55
git diff --exit-code c2 HEAD &&
56
git diff --exit-code c2 &&
57
58
- ! test_cmp head.old head &&
58
+ ! test_cmp head.old head.new &&
59
test_cmp head.old first-parent &&
60
test_cmp second-parent.expected second-parent &&
61
test_cmp tree.expected tree &&
@@ -72,7 +72,7 @@ test_expect_success 'trivial merge with custom strategy' '
72
git rev-parse c3^{tree} >tree.expected &&
73
git merge -s theirs c3 &&
74
75
- git rev-parse HEAD >head &&
75
+ git rev-parse HEAD >head.new &&
76
git rev-parse HEAD^1 >first-parent &&
77
git rev-parse HEAD^2 >second-parent &&
78
git rev-parse HEAD^{tree} >tree &&
@@ -81,7 +81,7 @@ test_expect_success 'trivial merge with custom strategy' '
81
git diff --exit-code c3 HEAD &&
82
git diff --exit-code c3 &&
83
84
- ! test_cmp head.old head &&
84
+ ! test_cmp head.old head.new &&
85
test_cmp head.old first-parent &&
86
test_cmp second-parent.expected second-parent &&
87
test_cmp tree.expected tree &&