From: Brian Gernhardt <brian@gernhardtsoftware.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] t7606: Avoid using head as a file name
Date: Mon, 23 Aug 2010 16:15:47 -0400 [thread overview]
Message-ID: <1282594547-78944-1-git-send-email-brian@gernhardtsoftware.com> (raw)
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
next reply other threads:[~2010-08-23 20:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-23 20:15 Brian Gernhardt [this message]
2010-08-23 20:27 ` [PATCH] t7606: Avoid using head as a file name Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1282594547-78944-1-git-send-email-brian@gernhardtsoftware.com \
--to=brian@gernhardtsoftware.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).