* [PATCH] t7606: Avoid using head as a file name
@ 2010-08-23 20:15 Brian Gernhardt
2010-08-23 20:27 ` Jonathan Nieder
0 siblings, 1 reply; 2+ messages in thread
From: Brian Gernhardt @ 2010-08-23 20:15 UTC (permalink / raw)
To: Git List; +Cc: Junio C Hamano
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>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] t7606: Avoid using head as a file name
2010-08-23 20:15 [PATCH] t7606: Avoid using head as a file name Brian Gernhardt
@ 2010-08-23 20:27 ` Jonathan Nieder
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Nieder @ 2010-08-23 20:27 UTC (permalink / raw)
To: Brian Gernhardt; +Cc: Git List, Junio C Hamano
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 <jrnieder@gmail.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-23 20:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-23 20:15 [PATCH] t7606: Avoid using head as a file name Brian Gernhardt
2010-08-23 20:27 ` Jonathan Nieder
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).