From: Johannes Sixt <j.sixt@viscovery.net>
To: Ralf Thielow <ralf.thielow@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: t6200: avoid path mangling issue on Windows
Date: Thu, 18 Apr 2013 08:42:25 +0200 [thread overview]
Message-ID: <516F95D1.5070209@viscovery.net> (raw)
In-Reply-To: <1365348344-1648-2-git-send-email-ralf.thielow@gmail.com>
From: Johannes Sixt <j6t@kdbg.org>
MSYS bash interprets the slash in the argument core.commentchar="/"
as root directory and mangles it into a Windows style path. Use a
different core.commentchar to dodge the issue.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
t/t6200-fmt-merge-msg.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index e7e945d..54b5744 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -179,8 +179,8 @@ test_expect_success '--log=5 with custom comment character' '
cat >expected <<-EOF &&
Merge branch ${apos}left${apos}
- / By Another Author (3) and A U Thor (2)
- / Via Another Committer
+ x By Another Author (3) and A U Thor (2)
+ x Via Another Committer
* left:
Left #5
Left #4
@@ -189,7 +189,7 @@ test_expect_success '--log=5 with custom comment character' '
Common #1
EOF
- git -c core.commentchar="/" fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual &&
+ git -c core.commentchar="x" fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual &&
test_cmp expected actual
'
--
1.8.2.1.1678.gf713add
next prev parent reply other threads:[~2013-04-18 6:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-07 15:25 [PATCH 1/2] fmt-merge-msg: respect core.commentchar in people credits Ralf Thielow
2013-04-07 15:25 ` [PATCH 2/2] fmt-merge-msg: use core.commentchar in tag signatures completely Ralf Thielow
2013-04-18 6:42 ` Johannes Sixt [this message]
2013-04-18 17:05 ` t6200: avoid path mangling issue on Windows Junio C Hamano
2013-04-19 5:48 ` Johannes Sixt
2013-04-19 16:33 ` Junio C Hamano
2013-04-19 19:46 ` Johannes Sixt
2013-04-19 21:22 ` Junio C Hamano
2013-04-21 0:05 ` Jonathan Nieder
2013-04-21 6:22 ` Johannes Sixt
2013-04-21 6:35 ` Jonathan Nieder
2013-04-21 7:12 ` Junio C Hamano
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=516F95D1.5070209@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ralf.thielow@gmail.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).