From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: [PATCH] mingw: hot-fix t5615
Date: Fri, 11 Nov 2016 17:29:33 +0100 (CET) [thread overview]
Message-ID: <f4336a7fa3df8c0b426c3d01ada8d7d8f38e588a.1478881741.git.johannes.schindelin@gmx.de> (raw)
That test made the incorrect assumption that the path separator character
is always a colon. On Windows, it is a semicolon instead.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Published-As: https://github.com/dscho/git/releases/tag/t5615-path-separator-v1
Fetch-It-Via: git fetch https://github.com/dscho/git t5615-path-separator-v1
This is required, but not sufficient, to fix `master` on Windows.
t/t5615-alternate-env.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/t/t5615-alternate-env.sh b/t/t5615-alternate-env.sh
index 22d9d81..3aeffb6 100755
--- a/t/t5615-alternate-env.sh
+++ b/t/t5615-alternate-env.sh
@@ -37,8 +37,10 @@ test_expect_success 'access alternate via absolute path' '
EOF
'
+sep=:
+test_have_prereq !MINGW || sep=\;
test_expect_success 'access multiple alternates' '
- check_obj "$(pwd)/one.git/objects:$(pwd)/two.git/objects" <<-EOF
+ check_obj "$(pwd)/one.git/objects$sep$(pwd)/two.git/objects" <<-EOF
$one blob
$two blob
EOF
base-commit: 0538b84027a8aba7e8b805e3ec8fceb3990023e5
--
2.10.1.583.g721a9e0
next reply other threads:[~2016-11-11 16:29 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-11 16:29 Johannes Schindelin [this message]
2016-11-11 17:06 ` [PATCH] mingw: hot-fix t5615 Junio C Hamano
2016-11-11 17:11 ` Johannes Sixt
2016-11-11 17:31 ` [PATCH] t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables Johannes Sixt
2016-11-11 18:16 ` Jeff King
2016-11-11 18:55 ` Junio C Hamano
2016-11-12 11:40 ` Johannes Schindelin
2016-11-13 1:13 ` Junio C Hamano
2016-11-14 9:11 ` Lars Schneider
2016-11-14 16:35 ` Torsten Bögershausen
2016-11-14 17:01 ` Jeff King
2016-11-14 19:45 ` Ramsay Jones
2016-11-14 17:21 ` Junio C Hamano
2016-11-15 16:54 ` Johannes Schindelin
2016-11-16 9:47 ` Johannes Schindelin
2016-11-16 21:51 ` Junio C Hamano
2016-11-11 18:12 ` [PATCH] mingw: hot-fix t5615 Jeff King
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=f4336a7fa3df8c0b426c3d01ada8d7d8f38e588a.1478881741.git.johannes.schindelin@gmx.de \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).