Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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>
  • Loading branch information...
commit 0e1b50152bfc12d2d286af17993f6356171e9ce5 1 parent 52b48ef
Brian Gernhardt authored August 23, 2010 gitster committed August 24, 2010

Showing 1 changed file with 4 additions and 4 deletions. Show diff stats Hide diff stats

  1. 8  t/t7606-merge-custom.sh
8  t/t7606-merge-custom.sh
@@ -46,7 +46,7 @@ test_expect_success 'merge c2 with a custom strategy' '
46 46
 	git rev-parse c2^{tree} >tree.expected &&
47 47
 	git merge -s theirs c2 &&
48 48
 
49  
-	git rev-parse HEAD >head &&
  49
+	git rev-parse HEAD >head.new &&
50 50
 	git rev-parse HEAD^1 >first-parent &&
51 51
 	git rev-parse HEAD^2 >second-parent &&
52 52
 	git rev-parse HEAD^{tree} >tree &&
@@ -55,7 +55,7 @@ test_expect_success 'merge c2 with a custom strategy' '
55 55
 	git diff --exit-code c2 HEAD &&
56 56
 	git diff --exit-code c2 &&
57 57
 
58  
-	! test_cmp head.old head &&
  58
+	! test_cmp head.old head.new &&
59 59
 	test_cmp head.old first-parent &&
60 60
 	test_cmp second-parent.expected second-parent &&
61 61
 	test_cmp tree.expected tree &&
@@ -72,7 +72,7 @@ test_expect_success 'trivial merge with custom strategy' '
72 72
 	git rev-parse c3^{tree} >tree.expected &&
73 73
 	git merge -s theirs c3 &&
74 74
 
75  
-	git rev-parse HEAD >head &&
  75
+	git rev-parse HEAD >head.new &&
76 76
 	git rev-parse HEAD^1 >first-parent &&
77 77
 	git rev-parse HEAD^2 >second-parent &&
78 78
 	git rev-parse HEAD^{tree} >tree &&
@@ -81,7 +81,7 @@ test_expect_success 'trivial merge with custom strategy' '
81 81
 	git diff --exit-code c3 HEAD &&
82 82
 	git diff --exit-code c3 &&
83 83
 
84  
-	! test_cmp head.old head &&
  84
+	! test_cmp head.old head.new &&
85 85
 	test_cmp head.old first-parent &&
86 86
 	test_cmp second-parent.expected second-parent &&
87 87
 	test_cmp tree.expected tree &&

0 notes on commit 0e1b501

Please sign in to comment.
Something went wrong with that request. Please try again.