From: Pat Thoyts <patthoyts@users.sourceforge.net>
To: Git Mailing List <git@vger.kernel.org>
Cc: msysGit <msysgit@googlegroups.com>,
Junio C Hamano <gitster@pobox.com>,
Pat Thoyts <patthoyts@users.sourceforge.net>
Subject: [PATCH 1/4] t3509: use unconstrained initial test to setup repository.
Date: Thu, 3 Feb 2011 15:31:42 +0000 [thread overview]
Message-ID: <1296747105-1663-2-git-send-email-patthoyts@users.sourceforge.net> (raw)
In-Reply-To: <1296747105-1663-1-git-send-email-patthoyts@users.sourceforge.net>
The first test did not run on msysGit due to the SYMLINKS constraint and
so subsequent tests failed because the test repository was not initialized.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
t/t3509-cherry-pick-merge-df.sh | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/t3509-cherry-pick-merge-df.sh b/t/t3509-cherry-pick-merge-df.sh
index 948ca1b..df921d1 100755
--- a/t/t3509-cherry-pick-merge-df.sh
+++ b/t/t3509-cherry-pick-merge-df.sh
@@ -3,12 +3,14 @@
test_description='Test cherry-pick with directory/file conflicts'
. ./test-lib.sh
-test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' '
+test_expect_success 'Initialize repository' '
mkdir a &&
>a/f &&
git add a &&
- git commit -m a &&
+ git commit -m a
+'
+test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' '
mkdir b &&
ln -s ../a b/a &&
git add b &&
--
1.7.4.msysgit.0
next prev parent reply other threads:[~2011-02-03 15:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-03 15:31 [PATCH] some test fixes for msysGit Pat Thoyts
2011-02-03 15:31 ` Pat Thoyts [this message]
2011-02-03 15:31 ` [PATCH 2/4] t4120-apply-popt: help systems with core.filemode=false Pat Thoyts
2011-02-03 15:31 ` [PATCH 3/4] t7407: fix line endings for mingw build Pat Thoyts
2011-02-03 15:31 ` [PATCH 4/4] t5526: avoid dependency on submodule order Pat Thoyts
2011-02-03 20:08 ` [msysGit] " Johannes Sixt
2011-02-03 20:26 ` Johannes Schindelin
2011-02-03 20:56 ` Johannes Sixt
2011-02-04 8:41 ` [PATCH maint] start_command: flush buffers in the WIN32 code path as well Johannes Sixt
2011-02-04 11:23 ` Pat Thoyts
2011-02-03 16:29 ` [msysGit] [PATCH] some test fixes for msysGit Johannes Schindelin
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1296747105-1663-2-git-send-email-patthoyts@users.sourceforge.net \
--to=patthoyts@users.sourceforge.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=msysgit@googlegroups.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.
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 NNTP newsgroup(s).